--- old/src/java.base/share/classes/jdk/experimental/value/MethodHandleBuilder.java 2017-06-30 16:05:39.225634342 +0100 +++ new/src/java.base/share/classes/jdk/experimental/value/MethodHandleBuilder.java 2017-06-30 16:05:38.993627440 +0100 @@ -55,14 +55,11 @@ static final Unsafe UNSAFE = Unsafe.getUnsafe(); static final boolean ENABLE_POOL_PATCHES; - static final boolean MANGLE_CLASS_INFO; static { Properties props = GetPropertyAction.privilegedGetProperties(); ENABLE_POOL_PATCHES = Boolean.parseBoolean( props.getProperty("valhalla.enablePoolPatches")); - MANGLE_CLASS_INFO = Boolean.parseBoolean( - props.getProperty("valhalla.mangleClassInfo")); } public static MethodHandle loadCode(Lookup lookup, String name, MethodType type, Consumer builder) { @@ -217,8 +214,8 @@ //THIS_CLASS cannot be a DVT (by construction) - never mangle name = clazz; } else { - name = (isValue && MANGLE_CLASS_INFO) ? - ";Q" + c.getName() + ";" : //mangle DVT name + name = isValue ? + MinimalValueTypes_1_0.mangleValueClassName(c.getName()) : c.getName(); } return name.replaceAll("\\.", "/");