OpenJDK / valhalla / valhalla
changeset 59599:fb5c34c883b5 nestmates tip
[nestmates] Rename Class:isHiddenClass to isHidden per Alex's feedback
Reviewed-by: dholmes
line wrap: on
line diff
--- a/src/hotspot/share/classfile/vmSymbols.cpp Tue Mar 31 11:34:17 2020 -0700 +++ b/src/hotspot/share/classfile/vmSymbols.cpp Tue Mar 31 16:54:52 2020 -0700 @@ -546,7 +546,7 @@ case vmIntrinsics::_isInterface: case vmIntrinsics::_isArray: case vmIntrinsics::_isPrimitive: - case vmIntrinsics::_isHiddenClass: + case vmIntrinsics::_isHidden: case vmIntrinsics::_getSuperclass: case vmIntrinsics::_Class_cast: case vmIntrinsics::_getLength:
--- a/src/hotspot/share/classfile/vmSymbols.hpp Tue Mar 31 11:34:17 2020 -0700 +++ b/src/hotspot/share/classfile/vmSymbols.hpp Tue Mar 31 16:54:52 2020 -0700 @@ -884,8 +884,8 @@ do_name( isArray_name, "isArray") \ do_intrinsic(_isPrimitive, java_lang_Class, isPrimitive_name, void_boolean_signature, F_RN) \ do_name( isPrimitive_name, "isPrimitive") \ - do_intrinsic(_isHiddenClass, java_lang_Class, isHiddenClass_name, void_boolean_signature, F_RN) \ - do_name( isHiddenClass_name, "isHiddenClass") \ + do_intrinsic(_isHidden, java_lang_Class, isHidden_name, void_boolean_signature, F_RN) \ + do_name( isHidden_name, "isHidden") \ do_intrinsic(_getSuperclass, java_lang_Class, getSuperclass_name, void_class_signature, F_RN) \ do_name( getSuperclass_name, "getSuperclass") \ do_intrinsic(_Class_cast, java_lang_Class, Class_cast_name, object_object_signature, F_R) \
--- a/src/hotspot/share/opto/c2compiler.cpp Tue Mar 31 11:34:17 2020 -0700 +++ b/src/hotspot/share/opto/c2compiler.cpp Tue Mar 31 16:54:52 2020 -0700 @@ -602,7 +602,7 @@ case vmIntrinsics::_isInterface: case vmIntrinsics::_isArray: case vmIntrinsics::_isPrimitive: - case vmIntrinsics::_isHiddenClass: + case vmIntrinsics::_isHidden: case vmIntrinsics::_getSuperclass: case vmIntrinsics::_getClassAccessFlags: case vmIntrinsics::_floatToRawIntBits:
--- a/src/hotspot/share/opto/library_call.cpp Tue Mar 31 11:34:17 2020 -0700 +++ b/src/hotspot/share/opto/library_call.cpp Tue Mar 31 16:54:52 2020 -0700 @@ -784,7 +784,7 @@ case vmIntrinsics::_isInterface: case vmIntrinsics::_isArray: case vmIntrinsics::_isPrimitive: - case vmIntrinsics::_isHiddenClass: + case vmIntrinsics::_isHidden: case vmIntrinsics::_getSuperclass: case vmIntrinsics::_getClassAccessFlags: return inline_native_Class_query(intrinsic_id()); @@ -3124,7 +3124,7 @@ prim_return_value = intcon(1); expect_prim = true; // obviously break; - case vmIntrinsics::_isHiddenClass: + case vmIntrinsics::_isHidden: prim_return_value = intcon(0); break; case vmIntrinsics::_getSuperclass: @@ -3219,7 +3219,7 @@ query_value = intcon(0); // "normal" path produces false break; - case vmIntrinsics::_isHiddenClass: + case vmIntrinsics::_isHidden: // (To verify this code sequence, check the asserts in JVM_IsHiddenClass.) if (generate_hidden_class_guard(kls, region) != NULL) // A guard was added. If the guard is taken, it was an hidden class.
--- a/src/java.base/share/classes/java/lang/Class.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/Class.java Tue Mar 31 16:54:52 2020 -0700 @@ -810,7 +810,7 @@ * returns "[[[[[[[I" * </pre></blockquote> * - * <p> If this class object represents a {@linkplain #isHiddenClass() hidden class}, + * <p> If this class object represents a {@linkplain #isHidden() hidden class}, * then the name of a hidden class is not a binary name and contains * a ASCII {@code '/'} character. * @@ -1652,7 +1652,7 @@ else return ReflectionData.NULL_SENTINEL; } - if (isHiddenClass() || isLocalOrAnonymousClass()) + if (isHidden() || isLocalOrAnonymousClass()) return ReflectionData.NULL_SENTINEL; Class<?> enclosingClass = getEnclosingClass(); if (enclosingClass == null) { // top level class @@ -1668,7 +1668,7 @@ /** * Returns {@code true} if and only if the underlying class * is an anonymous class. An anonymous class is not a - * {@linkplain #isHiddenClass() hidden class}. + * {@linkplain #isHidden() hidden class}. * * @return {@code true} if and only if this class is an anonymous class. * @since 1.5 @@ -4249,6 +4249,6 @@ * @see MethodHandles.Lookup#defineHiddenClass */ @HotSpotIntrinsicCandidate - public native boolean isHiddenClass(); + public native boolean isHidden(); }
--- a/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/invoke/InnerClassLambdaMetafactory.java Tue Mar 31 16:54:52 2020 -0700 @@ -185,7 +185,7 @@ private static String lambdaClassName(Class<?> targetClass) { String name = targetClass.getName(); - if (targetClass.isHiddenClass()) { + if (targetClass.isHidden()) { // use the original class name name = name.replace('/', '_'); }
--- a/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java Tue Mar 31 16:54:52 2020 -0700 @@ -1025,7 +1025,7 @@ return false; // inner class of some sort if (cls.getClassLoader() != MethodHandle.class.getClassLoader()) return false; // not on BCP - if (cls.isHiddenClass()) + if (cls.isHidden()) return false; if (ReflectUtil.isVMAnonymousClass(cls)) // FIXME: Unsafe::defineAnonymousClass to be removed return false; @@ -1051,14 +1051,14 @@ if (cls == Object.class) return true; if (MethodHandle.class.isAssignableFrom(cls)) { - assert(!cls.isHiddenClass()); + assert(!cls.isHidden()); return true; } while (cls.isArray()) cls = cls.getComponentType(); if (cls.isPrimitive()) return true; // int[].class, for example - if (cls.isHiddenClass()) + if (cls.isHidden()) return false; if (ReflectUtil.isVMAnonymousClass(cls)) // FIXME: Unsafe::defineAnonymousClass to be removed return false;
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java Tue Mar 31 16:54:52 2020 -0700 @@ -1167,7 +1167,7 @@ * @CSM must be public and exported if called by any module. */ String name = targetClass.getName() + "$$InjectedInvoker"; - if (targetClass.isHiddenClass()) { + if (targetClass.isHidden()) { // use the original class name name = name.replace('/', '_'); }
--- a/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/invoke/MethodHandles.java Tue Mar 31 16:54:52 2020 -0700 @@ -1936,7 +1936,7 @@ * @throws NullPointerException if any parameter is {@code null} * * @since 15 - * @see Class#isHiddenClass() + * @see Class#isHidden() * @jvms 4.2.1 Binary Class and Interface Names * @jvms 4.2.2 Unqualified Names * @jvms 4.7.28 The {@code NestHost} Attribute @@ -2002,7 +2002,7 @@ * * @since 15 * @see Lookup#defineHiddenClass(byte[], boolean, ClassOption...) - * @see Class#isHiddenClass() + * @see Class#isHidden() */ public Lookup defineHiddenClassWithClassData(byte[] bytes, Object classData, ClassOption... options) throws IllegalAccessException @@ -3168,7 +3168,7 @@ if (isSetter && field.isFinal()) { if (field.isStatic()) { throw field.makeAccessException("static final field has no write access", this); - } else if (field.getDeclaringClass().isHiddenClass()){ + } else if (field.getDeclaringClass().isHidden()){ throw field.makeAccessException("final field in a hidden class has no write access", this); } } @@ -3733,7 +3733,7 @@ refc = lookupClass(); } return VarHandles.makeFieldHandle(getField, refc, getField.getFieldType(), - this.allowedModes == TRUSTED && !getField.getDeclaringClass().isHiddenClass()); + this.allowedModes == TRUSTED && !getField.getDeclaringClass().isHidden()); } /** Check access and get the requested constructor. */ private MethodHandle getDirectConstructor(Class<?> refc, MemberName ctor) throws IllegalAccessException {
--- a/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/invoke/StringConcatFactory.java Tue Mar 31 16:54:52 2020 -0700 @@ -730,7 +730,7 @@ String pkgName = hostClass.getPackageName(); return (!pkgName.isEmpty() ? pkgName.replace('.', '/') + "/" : "") + "Stubs$$StringConcat"; } else { - String name = hostClass.isHiddenClass() ? hostClass.getName().replace('/', '_') + String name = hostClass.isHidden() ? hostClass.getName().replace('/', '_') : hostClass.getName(); return name.replace('.', '/') + "$$StringConcat"; }
--- a/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/reflect/AccessibleObject.java Tue Mar 31 16:54:52 2020 -0700 @@ -177,7 +177,7 @@ * to the caller's module. </p> * * <p> This method cannot be used to enable {@linkplain Field#set <em>write</em>} - * access to a final field declared in a {@linkplain Class#isHiddenClass() hidden class}, + * access to a final field declared in a {@linkplain Class#isHidden() hidden class}, * since such fields are not modifiable. The {@code accessible} flag when * {@code true} suppresses Java language access control checks to only * enable {@linkplain Field#get <em>read</em>} access to such fields.
--- a/src/java.base/share/classes/java/lang/reflect/Field.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/java/lang/reflect/Field.java Tue Mar 31 16:54:52 2020 -0700 @@ -727,7 +727,7 @@ * <li>{@link #setAccessible(boolean) setAccessible(true)} has succeeded for * this {@code Field} object;</li> * <li>the field is non-static; and</li> - * <li>the field's declaring class is not a {@linkplain Class#isHiddenClass() + * <li>the field's declaring class is not a {@linkplain Class#isHidden() * hidden class}.</li> * </ul> * If any of the above checks is not met, this method throws an
--- a/src/java.base/share/classes/jdk/internal/reflect/NativeConstructorAccessorImpl.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/jdk/internal/reflect/NativeConstructorAccessorImpl.java Tue Mar 31 16:54:52 2020 -0700 @@ -50,7 +50,7 @@ // because that kind of class can't be referred to by name, hence can't // be found from the generated bytecode. if (++numInvocations > ReflectionFactory.inflationThreshold() - && !c.getDeclaringClass().isHiddenClass() + && !c.getDeclaringClass().isHidden() && !ReflectUtil.isVMAnonymousClass(c.getDeclaringClass())) { ConstructorAccessorImpl acc = (ConstructorAccessorImpl) new MethodAccessorGenerator().
--- a/src/java.base/share/classes/jdk/internal/reflect/NativeMethodAccessorImpl.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/jdk/internal/reflect/NativeMethodAccessorImpl.java Tue Mar 31 16:54:52 2020 -0700 @@ -48,7 +48,7 @@ // that kind of class can't be referred to by name, hence can't be // found from the generated bytecode. if (++numInvocations > ReflectionFactory.inflationThreshold() - && !method.getDeclaringClass().isHiddenClass() + && !method.getDeclaringClass().isHidden() && !ReflectUtil.isVMAnonymousClass(method.getDeclaringClass())) { MethodAccessorImpl acc = (MethodAccessorImpl) new MethodAccessorGenerator().
--- a/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/jdk/internal/reflect/ReflectionFactory.java Tue Mar 31 16:54:52 2020 -0700 @@ -200,7 +200,7 @@ method = root; } - if (noInflation && !method.getDeclaringClass().isHiddenClass() + if (noInflation && !method.getDeclaringClass().isHidden() && !ReflectUtil.isVMAnonymousClass(method.getDeclaringClass())) { return new MethodAccessorGenerator(). generateMethod(method.getDeclaringClass(), @@ -245,7 +245,7 @@ return new BootstrapConstructorAccessorImpl(c); } - if (noInflation && !c.getDeclaringClass().isHiddenClass() + if (noInflation && !c.getDeclaringClass().isHidden() && !ReflectUtil.isVMAnonymousClass(c.getDeclaringClass())) { return new MethodAccessorGenerator(). generateConstructor(c.getDeclaringClass(),
--- a/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorFactory.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/classes/jdk/internal/reflect/UnsafeFieldAccessorFactory.java Tue Mar 31 16:54:52 2020 -0700 @@ -35,7 +35,7 @@ boolean isFinal = Modifier.isFinal(field.getModifiers()); boolean isVolatile = Modifier.isVolatile(field.getModifiers()); boolean isQualified = isFinal || isVolatile; - boolean isReadOnly = isFinal && (isStatic || !override || field.getDeclaringClass().isHiddenClass()); + boolean isReadOnly = isFinal && (isStatic || !override || field.getDeclaringClass().isHidden()); if (isStatic) { // This code path does not guarantee that the field's // declaring class has been initialized, but it must be
--- a/src/java.base/share/native/libjava/Class.c Tue Mar 31 11:34:17 2020 -0700 +++ b/src/java.base/share/native/libjava/Class.c Tue Mar 31 16:54:52 2020 -0700 @@ -61,7 +61,7 @@ {"getSigners", "()[" OBJ, (void *)&JVM_GetClassSigners}, {"setSigners", "([" OBJ ")V", (void *)&JVM_SetClassSigners}, {"isArray", "()Z", (void *)&JVM_IsArrayClass}, - {"isHiddenClass", "()Z", (void *)&JVM_IsHiddenClass}, + {"isHidden", "()Z", (void *)&JVM_IsHiddenClass}, {"isPrimitive", "()Z", (void *)&JVM_IsPrimitiveClass}, {"getModifiers", "()I", (void *)&JVM_GetClassModifiers}, {"getDeclaredFields0","(Z)[" FLD, (void *)&JVM_GetClassDeclaredFields},
--- a/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java Tue Mar 31 11:34:17 2020 -0700 +++ b/src/jdk.unsupported/share/classes/sun/misc/Unsafe.java Tue Mar 31 16:54:52 2020 -0700 @@ -640,7 +640,7 @@ if (f == null) { throw new NullPointerException(); } - if (f.getDeclaringClass().isHiddenClass()) { + if (f.getDeclaringClass().isHidden()) { throw new UnsupportedOperationException("can't get field offset on a hidden class: " + f); } return theInternalUnsafe.objectFieldOffset(f); @@ -668,7 +668,7 @@ if (f == null) { throw new NullPointerException(); } - if (f.getDeclaringClass().isHiddenClass()) { + if (f.getDeclaringClass().isHidden()) { throw new UnsupportedOperationException("can't get field offset on a hidden class: " + f); } return theInternalUnsafe.staticFieldOffset(f); @@ -689,7 +689,7 @@ if (f == null) { throw new NullPointerException(); } - if (f.getDeclaringClass().isHiddenClass()) { + if (f.getDeclaringClass().isHidden()) { throw new UnsupportedOperationException("can't get base address on a hidden class: " + f); } return theInternalUnsafe.staticFieldBase(f);
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestMetaAccessProvider.java Tue Mar 31 16:54:52 2020 -0700 @@ -69,7 +69,7 @@ }; private static boolean isHiddenClass(Class<?> cls) { - if (cls.isHiddenClass()) { + if (cls.isHidden()) { return true; } @@ -77,7 +77,7 @@ while (cls.getComponentType() != null) { cls = cls.getComponentType(); } - if (cls.isHiddenClass()) { + if (cls.isHidden()) { return true; } return false;
--- a/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/hotspot/jtreg/compiler/jvmci/jdk.vm.ci.runtime.test/src/jdk/vm/ci/runtime/test/TestResolvedJavaType.java Tue Mar 31 16:54:52 2020 -0700 @@ -177,7 +177,7 @@ host = type.getHostClass(); assertNull(host); if (type.equals(predicateType)) { - assertTrue(c.isHiddenClass()); + assertTrue(c.isHidden()); } } @@ -190,9 +190,9 @@ ResolvedJavaType lambdaType = metaAccess.lookupJavaType(lambda.getClass()); ResolvedJavaType nestedLambdaType = metaAccess.lookupJavaType(lambda.get().getClass()); assertNull(lambdaType.getHostClass()); - assertTrue(lambda.getClass().isHiddenClass()); + assertTrue(lambda.getClass().isHidden()); assertNull(nestedLambdaType.getHostClass()); - assertTrue(lambda.get().getClass().isHiddenClass()); + assertTrue(lambda.get().getClass().isHidden()); } @Test
--- a/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/P/Q/HiddenClassSigTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/P/Q/HiddenClassSigTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -38,12 +38,9 @@ import java.lang.invoke.MethodHandles; import java.lang.invoke.MethodHandles.Lookup; -import java.nio.file.Path; -import java.nio.file.Paths; import jdk.test.lib.Utils; import jdk.test.lib.compiler.InMemoryJavaCompiler; -import jdk.internal.misc.Unsafe; interface Test<T> { @@ -106,7 +103,7 @@ static void logClassInfo(Class<?> klass) { log("\n### Testing class: " + klass); - log(LOG_PREFIX + "isHiddenClass: " + klass.isHiddenClass()); + log(LOG_PREFIX + "isHidden: " + klass.isHidden()); log(LOG_PREFIX + "getName: " + klass.getName()); log(LOG_PREFIX + "typeName: " + klass.getTypeName()); log(LOG_PREFIX + "toString: " + klass.toString()); @@ -146,7 +143,7 @@ String elemStr = elemClass.toString().substring(CLASS_PREFIX.length()); String elemGen = elemClass.toGenericString(); - if (elemClass.isHiddenClass()) { + if (elemClass.isHidden()) { elemGen = elemGen.substring(CLASS_PREFIX.length()); } failed |= checkNameHas(arrName, elemName, "klass.getName()"); @@ -179,8 +176,8 @@ failed |= checkName(klass.toString(), expStr, "klass.toString()"); failed |= checkName(klass.toGenericString(), expGen, "klass.toGenericString()"); - if (klass.isHiddenClass() != isHidden) { - log("Test FAIL: result of klass.isHiddenClass() does not match expectation"); + if (klass.isHidden() != isHidden) { + log("Test FAIL: result of klass.isHidden() does not match expectation"); failed = true; } String sig = hcSignature(klass);
--- a/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp Tue Mar 31 11:34:17 2020 -0700 +++ b/test/hotspot/jtreg/serviceability/jvmti/HiddenClass/libHiddenClassSigTest.cpp Tue Mar 31 16:54:52 2020 -0700 @@ -46,7 +46,7 @@ return; \ } -/* Return the jmethodID of j.l.Class.isHiddenClass() method. */ +/* Return the jmethodID of j.l.Class.isHidden() method. */ static jmethodID is_hidden_mid(JNIEnv* jni) { char* csig = NULL; @@ -58,10 +58,10 @@ return NULL; } - // find the jmethodID of j.l.Class.isHiddenClass() method - jmethodID mid = jni->GetMethodID(clazz, "isHiddenClass", "()Z"); + // find the jmethodID of j.l.Class.isHidden() method + jmethodID mid = jni->GetMethodID(clazz, "isHidden", "()Z"); if (mid == NULL) { - jni->FatalError("is_hidden_mid: Error in jni GetMethodID: Cannot find j.l.Class.isHiddenClass method\n"); + jni->FatalError("is_hidden_mid: Error in jni GetMethodID: Cannot find j.l.Class.isHidden method\n"); } return mid; } @@ -74,7 +74,7 @@ if (is_hid_mid == NULL) { is_hid_mid = is_hidden_mid(jni); } - // invoke j.l.Class.isHiddenClass() method + // invoke j.l.Class.isHidden() method return jni->CallBooleanMethod(klass, is_hid_mid); }
--- a/test/jdk/java/lang/instrument/HiddenClass/HiddenClassAgent.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/instrument/HiddenClass/HiddenClassAgent.java Tue Mar 31 16:54:52 2020 -0700 @@ -95,7 +95,7 @@ for (int i = 0; i < classes.length; i++) { Class klass = classes[i]; - if (!klass.isHiddenClass() || !klass.getName().contains("HiddenClass/")) { + if (!klass.isHidden() || !klass.getName().contains("HiddenClass/")) { continue; } log("HiddenClassAgent: getAllLoadedClasses returned hidden class: " + klass); @@ -128,7 +128,7 @@ for (int i = 0; i < classes.length; i++) { Class klass = classes[i]; - if (klass.isHiddenClass()) { + if (klass.isHidden()) { log("HiddenClassAgent: FAIL: getInitiatedClasses returned hidden class: " + klass); failed = true; return;
--- a/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/invoke/defineHiddenClass/BasicTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -58,7 +58,6 @@ import org.testng.annotations.Test; import static jdk.internal.org.objectweb.asm.Opcodes.*; -import static jdk.internal.org.objectweb.asm.Opcodes.IRETURN; import static org.testng.Assert.*; interface HiddenTest { @@ -111,7 +110,7 @@ // sanity check Class<?> c = t.getClass(); Class<?>[] intfs = c.getInterfaces(); - assertTrue(c.isHiddenClass()); + assertTrue(c.isHidden()); assertFalse(c.isPrimitive()); assertTrue(intfs.length == 1); assertTrue(intfs[0] == HiddenTest.class); @@ -129,8 +128,8 @@ // primitive class is not a hidden class @Test public void primitiveClass() { - assertFalse(int.class.isHiddenClass()); - assertFalse(String.class.isHiddenClass()); + assertFalse(int.class.isHidden()); + assertFalse(String.class.isHidden()); } private void testHiddenArray(Class<?> type) throws Exception { @@ -139,10 +138,10 @@ Class<?> arrayType = array.getClass(); assertTrue(arrayType.isArray()); assertTrue(Array.getLength(array) == 2); - assertFalse(arrayType.isHiddenClass()); + assertFalse(arrayType.isHidden()); assertTrue(arrayType.getName().startsWith("[LHiddenClass/"), "unexpected name: " + arrayType.getName()); - assertTrue(arrayType.getComponentType().isHiddenClass()); + assertTrue(arrayType.getComponentType().isHidden()); assertTrue(arrayType.getComponentType() == type); Object t = type.newInstance(); Array.set(array, 0, t); @@ -292,7 +291,7 @@ default: throw new IllegalArgumentException("unexpected access flag: " + accessFlags); } - assertTrue(hc.isHiddenClass()); + assertTrue(hc.isHidden()); assertTrue(hc.getModifiers() == (ACC_PUBLIC|accessFlags)); assertFalse(hc.isLocalClass()); assertFalse(hc.isMemberClass()); @@ -418,7 +417,7 @@ // a hidden class with bad InnerClasses or EnclosingMethod attribute private void hiddenClassWithBadAttribute(Class<?> hc, String badDeclaringClassName) { - assertTrue(hc.isHiddenClass()); + assertTrue(hc.isHidden()); assertTrue(hc.getCanonicalName() == null); assertTrue(hc.getName().contains("/")); @@ -469,7 +468,7 @@ } private static void assertHiddenClass(Class<?> hc) { - assertTrue(hc.isHiddenClass()); + assertTrue(hc.isHidden()); assertTrue(hc.getCanonicalName() == null); assertTrue(hc.getName().contains("/")); assertFalse(hc.isAnonymousClass());
--- a/test/jdk/java/lang/invoke/defineHiddenClass/DefineClassWithClassData.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/invoke/defineHiddenClass/DefineClassWithClassData.java Tue Mar 31 16:54:52 2020 -0700 @@ -100,7 +100,7 @@ Lookup lookup = MethodHandles.lookup().defineHiddenClassWithClassData(T_CLASS_BYTES, classData, NESTMATE); Class<?> c = lookup.lookupClass(); assertTrue(c.getNestHost() == DefineClassWithClassData.class); - assertTrue(c.isHiddenClass()); + assertTrue(c.isHidden()); assertEquals(classData, injectedData(c)); // invoke int test(DefineClassWithClassData o) @@ -117,7 +117,7 @@ Lookup lookup = MethodHandles.lookup().defineHiddenClassWithClassData(T_CLASS_BYTES, classData, STRONG); Class<?> c = lookup.lookupClass(); assertTrue(c.getNestHost() == c); - assertTrue(c.isHiddenClass()); + assertTrue(c.isHidden()); } @Test(expectedExceptions = IllegalAccessException.class) @@ -133,14 +133,14 @@ Class<?> c = lookup.lookupClass(); assertTrue(c.getNestHost() == DefineClassWithClassData.class); assertEquals(classData, injectedData(c)); - assertTrue(c.isHiddenClass()); + assertTrue(c.isHidden()); // Teleport to a nestmate Lookup lookup2 = MethodHandles.lookup().in(DefineClassWithClassData.class); assertTrue((lookup2.lookupModes() & PRIVATE) != 0); Lookup lc = lookup2.defineHiddenClassWithClassData(T2_CLASS_BYTES, classData, NESTMATE); assertTrue(lc.lookupClass().getNestHost() == DefineClassWithClassData.class); - assertTrue(lc.lookupClass().isHiddenClass()); + assertTrue(lc.lookupClass().isHidden()); } static class ClassByteBuilder {
--- a/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/invoke/defineHiddenClass/HiddenNestmateTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -54,7 +54,7 @@ Class<?> hiddenClass = lookup.lookupClass(); Class<?> nestHost = hiddenClass.getNestHost(); - assertTrue(hiddenClass.isHiddenClass()); + assertTrue(hiddenClass.isHidden()); assertTrue(nestHost == MethodHandles.lookup().lookupClass()); // hidden nestmate is not listed in the return array of getNestMembers @@ -73,7 +73,7 @@ Class<?> c = lookup.lookupClass(); assertTrue(lookup.hasFullPrivilegeAccess()); assertTrue(c.getNestHost() == c); // host of its own nest - assertTrue(c.isHiddenClass()); + assertTrue(c.isHidden()); // invoke int test(HiddenNestmateTest o) via MethodHandle MethodHandle ctor = lookup.findConstructor(c, MethodType.methodType(void.class));
--- a/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/invoke/defineHiddenClass/LambdaNestedInnerTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -58,7 +58,7 @@ public void run() { // validate the lambda proxy class Class<?> lambdaProxyClass = lambda1.getClass(); - assertTrue(lambdaProxyClass.isHiddenClass()); + assertTrue(lambdaProxyClass.isHidden()); System.out.format("%s nest host %s nestmate of Inner class %s%n", lambdaProxyClass, lambdaProxyClass.getNestHost(), lambdaProxyClass.isNestmateOf(Inner.class));
--- a/test/jdk/java/lang/invoke/defineHiddenClass/UnloadingTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/invoke/defineHiddenClass/UnloadingTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -209,7 +209,7 @@ static class HiddenClassUnloader { private final WeakReference<Class<?>> weakRef; private HiddenClassUnloader(Class<?> hc) { - assertTrue(hc.isHiddenClass()); + assertTrue(hc.isHidden()); this.weakRef = new WeakReference<>(hc); }
--- a/test/jdk/java/lang/invoke/defineHiddenClass/UnreflectTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/invoke/defineHiddenClass/UnreflectTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -68,7 +68,7 @@ // class loader as non-hidden class Class<?> c = Fields.class; Fields o = new Fields(); - assertFalse(c.isHiddenClass()); + assertFalse(c.isHidden()); readOnlyAccessibleObject(c, "STATIC_FINAL", null, true); readWriteAccessibleObject(c, "STATIC_NON_FINAL", null, false); readWriteAccessibleObject(c, "FINAL", o, true); @@ -81,7 +81,7 @@ */ @Test public void testFieldsInHiddenClass() throws Throwable { - assertTrue(hiddenClass.isHiddenClass()); + assertTrue(hiddenClass.isHidden()); Object o = hiddenClass.newInstance(); readOnlyAccessibleObject(hiddenClass, "STATIC_FINAL", null, true); readWriteAccessibleObject(hiddenClass, "STATIC_NON_FINAL", null, false);
--- a/test/jdk/java/lang/invoke/nestmates/NestmateTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/invoke/nestmates/NestmateTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -139,7 +139,7 @@ Lookup lookup = MyThreadLocal.lookup() .defineHiddenClassWithClassData(bytes, mh.bindTo(tl), ClassOption.NESTMATE); Class<?> hiddenClass = lookup.lookupClass(); - assertTrue(hiddenClass.isHiddenClass()); + assertTrue(hiddenClass.isHidden()); // ThreadLocal::initialValue can only be produced by calling findSpecial // on the Lookup on MyThreadLocal with the specialCaller == MyThreadLocal
--- a/test/jdk/java/lang/reflect/AccessibleObject/HiddenClassTest.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/java/lang/reflect/AccessibleObject/HiddenClassTest.java Tue Mar 31 16:54:52 2020 -0700 @@ -65,7 +65,7 @@ // class loader as non-hidden class Class<?> c = Fields.class; Fields o = new Fields(); - assertFalse(c.isHiddenClass()); + assertFalse(c.isHidden()); readOnlyAccessibleObject(c, "STATIC_FINAL", null, true); readWriteAccessibleObject(c, "STATIC_NON_FINAL", null, false); readWriteAccessibleObject(c, "FINAL", o, true); @@ -78,7 +78,7 @@ */ @Test public void testFieldsInHiddenClass() throws Throwable { - assertTrue(hiddenClass.isHiddenClass()); + assertTrue(hiddenClass.isHidden()); Object o = hiddenClass.newInstance(); readOnlyAccessibleObject(hiddenClass, "STATIC_FINAL", null, true); readWriteAccessibleObject(hiddenClass, "STATIC_NON_FINAL", null, false);
--- a/test/jdk/sun/misc/UnsafeFieldOffsets.java Tue Mar 31 11:34:17 2020 -0700 +++ b/test/jdk/sun/misc/UnsafeFieldOffsets.java Tue Mar 31 16:54:52 2020 -0700 @@ -65,8 +65,7 @@ try { byte[] bytes = Files.readAllBytes(cf); Class<?> c = MethodHandles.lookup().defineHiddenClass(bytes, true).lookupClass(); - if (!c.isHiddenClass()) - throw new RuntimeException("Expected hidden class: " + c); + assertHiddenClass(c); return c; } catch (IOException e) { throw new UncheckedIOException(e); @@ -110,12 +109,12 @@ } private static void assertNonHiddenClass(Class<?> c) { - if (c.isHiddenClass()) + if (c.isHidden()) throw new RuntimeException("Expected UOE but not thrown: " + c); } private static void assertHiddenClass(Class<?> c) { - if (!c.isHiddenClass()) + if (!c.isHidden()) throw new RuntimeException("Expected hidden class but is not: " + c); } }