Pull/merge in changes for JDK-8255883

Author: AlanBateman

src/java.base/share/classes/jdk/internal/reflect/NativeConstructorAccessorImpl.java

@@ -34,9 +34,14 @@
     afterward, switches to bytecode-based implementation */
 
 class NativeConstructorAccessorImpl extends ConstructorAccessorImpl {
+    private static final Unsafe U = Unsafe.getUnsafe();
+    private static final long GENERATED_OFFSET
+        = U.objectFieldOffset(NativeConstructorAccessorImpl.class, "generated");
+
     private final Constructor<?> c;
     private DelegatingConstructorAccessorImpl parent;
     private int numInvocations;
+    private volatile int generated;
 
     NativeConstructorAccessorImpl(Constructor<?> c) {
         this.c = c;
@@ -50,15 +55,24 @@ public Object newInstance(Object[] args)
         // We can't inflate a constructor belonging to a vm-anonymous class
         // 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()
-                || Thread.currentThread().isVirtual())
-                    && !c.getDeclaringClass().isHidden()
-                    && !ReflectUtil.isVMAnonymousClass(c.getDeclaringClass())) {
+        if (!c.getDeclaringClass().isHidden()
+                && !ReflectUtil.isVMAnonymousClass(c.getDeclaringClass())
+                && (Thread.currentThread().isVirtual()
+                    || ((++numInvocations > ReflectionFactory.inflationThreshold()
+                        && (generated == 0)
+                        && U.compareAndSetInt(this, GENERATED_OFFSET, 0, 1))))) {
 
             // class initializer may not have run
             Unsafe.getUnsafe().ensureClassInitialized(c.getDeclaringClass());
 
-            ConstructorAccessorImpl acc = NewAccessorImplFactory.newConstructorAccessorImpl(c);
+            ConstructorAccessorImpl acc;
+            try {
+                acc = NewAccessorImplFactory.newConstructorAccessorImpl(c);
+            } catch (Throwable t) {
+                // newConstructorAccessorImpl failed, restore generated to 0
+                generated = 0;
+                throw t;
+            }
 
             parent.setDelegate(acc);
             return acc.newInstance(args);

src/java.base/share/classes/jdk/internal/reflect/NativeMethodAccessorImpl.java

@@ -34,9 +34,14 @@
     switches to bytecode-based implementation */
 
 class NativeMethodAccessorImpl extends MethodAccessorImpl {
+    private static final Unsafe U = Unsafe.getUnsafe();
+    private static final long GENERATED_OFFSET
+        = U.objectFieldOffset(NativeMethodAccessorImpl.class, "generated");
+
     private final Method method;
     private DelegatingMethodAccessorImpl parent;
     private int numInvocations;
+    private volatile int generated;
 
     NativeMethodAccessorImpl(Method method) {
         this.method = method;
@@ -48,27 +53,34 @@ public Object invoke(Object obj, Object[] args)
         // We can't inflate methods belonging to vm-anonymous classes 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()
-                || Thread.currentThread().isVirtual())
-                    && !method.getDeclaringClass().isHidden()
-                    && !ReflectUtil.isVMAnonymousClass(method.getDeclaringClass())) {
+        if (!method.getDeclaringClass().isHidden()
+                && !ReflectUtil.isVMAnonymousClass(method.getDeclaringClass())
+                && (Thread.currentThread().isVirtual()
+                    || (++numInvocations > ReflectionFactory.inflationThreshold()
+                        && (generated == 0)
+                        && U.compareAndSetInt(this, GENERATED_OFFSET, 0, 1)))) {
 
             // class initializer may not have run
             Unsafe.getUnsafe().ensureClassInitialized(method.getDeclaringClass());
 
             MethodAccessorImpl acc;
-            if (Reflection.isCallerSensitive(method)) {
+            try {
                 // use bytecode generated implementation for @CS methods for now
-                acc = (MethodAccessorImpl)
-                        new MethodAccessorGenerator().
-                                generateMethod(method.getDeclaringClass(),
-                                               method.getName(),
-                                               method.getParameterTypes(),
-                                               method.getReturnType(),
-                                               method.getExceptionTypes(),
-                                               method.getModifiers());
-            } else {
-                acc = NewAccessorImplFactory.newMethodAccessorImpl(method);
+                if (Reflection.isCallerSensitive(method)) {
+                    acc = (MethodAccessorImpl) new MethodAccessorGenerator()
+                                .generateMethod(method.getDeclaringClass(),
+                                                method.getName(),
+                                                method.getParameterTypes(),
+                                                method.getReturnType(),
+                                                method.getExceptionTypes(),
+                                                method.getModifiers());
+                } else {
+                    acc = NewAccessorImplFactory.newMethodAccessorImpl(method);
+                }
+            } catch (Throwable t) {
+                // generateMethod/newMethodAccessorImpl failed, restore generated to 0
+                generated = 0;
+                throw t;
             }
 
             parent.setDelegate(acc);