test/compiler/jsr292/CallSiteDepContextTest.java

*** 22,37 ****
   */
  
  /**
   * @test
   * @bug 8057967
!  * @ignore 8079205
!  * @run main/bootclasspath -Xbatch java.lang.invoke.CallSiteDepContextTest
   */
  package java.lang.invoke;
  
  import java.lang.ref.*;
  import jdk.internal.org.objectweb.asm.*;
  import sun.misc.Unsafe;
  
  import static jdk.internal.org.objectweb.asm.Opcodes.*;
  
--- 22,40 ----
   */
  
  /**
   * @test
   * @bug 8057967
!  * @run main/bootclasspath -Xbatch -XX:+IgnoreUnrecognizedVMOptions -XX:+TraceClassUnloading
!  *                         -XX:+PrintCompilation -XX:+TraceDependencies -XX:+TraceReferenceGC
!  *                         -verbose:gc java.lang.invoke.CallSiteDepContextTest
   */
  package java.lang.invoke;
  
  import java.lang.ref.*;
+ import java.lang.reflect.Field;
+ 
  import jdk.internal.org.objectweb.asm.*;
  import sun.misc.Unsafe;
  
  import static jdk.internal.org.objectweb.asm.Opcodes.*;
  
*** 94,103 ****
--- 97,114 ----
                  }
              }
          }
      }
  
+     public static void testHiddenDepField() throws Exception {
+         Class<?> contextClass = Class.forName("java.lang.invoke.CallSite$Context");
+         try {
+             Field f = contextClass.getDeclaredField("dependencies");
+             throw new AssertionError("Context.dependencies field should be hidden");
+         } catch(NoSuchFieldException e) { /* expected */ }
+     }
+ 
      public static void testSharedCallSite() throws Throwable {
          Class<?> cls1 = UNSAFE.defineAnonymousClass(Object.class, getClassFile("CS_1"), null);
          Class<?> cls2 = UNSAFE.defineAnonymousClass(Object.class, getClassFile("CS_2"), null);
  
          MethodHandle[] mhs = new MethodHandle[] {
*** 130,145 ****
      }
  
      static ReferenceQueue rq = new ReferenceQueue();
      static PhantomReference ref;
  
!     public static void testGC() throws Throwable {
          mcs = new MutableCallSite(LOOKUP.findStatic(T.class, "f1", TYPE));
  
          Class<?>[] cls = new Class[] {
!                 UNSAFE.defineAnonymousClass(Object.class, getClassFile("GC_1"), null),
!                 UNSAFE.defineAnonymousClass(Object.class, getClassFile("GC_2"), null),
          };
  
          MethodHandle[] mhs = new MethodHandle[] {
                  LOOKUP.findStatic(cls[0], METHOD_NAME, TYPE),
                  LOOKUP.findStatic(cls[1], METHOD_NAME, TYPE),
--- 141,158 ----
      }
  
      static ReferenceQueue rq = new ReferenceQueue();
      static PhantomReference ref;
  
!     public static void testGC(boolean clear, boolean precompile) throws Throwable {
!         String id = "_" + clear + "_" + precompile;
! 
          mcs = new MutableCallSite(LOOKUP.findStatic(T.class, "f1", TYPE));
  
          Class<?>[] cls = new Class[] {
!                 UNSAFE.defineAnonymousClass(Object.class, getClassFile("GC_1" + id), null),
!                 UNSAFE.defineAnonymousClass(Object.class, getClassFile("GC_2" + id), null),
          };
  
          MethodHandle[] mhs = new MethodHandle[] {
                  LOOKUP.findStatic(cls[0], METHOD_NAME, TYPE),
                  LOOKUP.findStatic(cls[1], METHOD_NAME, TYPE),
*** 149,180 ****
          int r = (int) mhs[0].invokeExact();
  
          execute(1, mhs);
  
          ref = new PhantomReference<>(cls[0], rq);
!         cls[0] = UNSAFE.defineAnonymousClass(Object.class, getClassFile("GC_3"), null);
          mhs[0] = LOOKUP.findStatic(cls[0], METHOD_NAME, TYPE);
  
          do {
              System.gc();
              try {
!                 Reference ref1 = rq.remove(1000);
                  if (ref1 == ref) {
-                     ref1.clear();
-                     System.gc(); // Ensure that the stale context is cleared
                      break;
                  }
              } catch(InterruptedException e) { /* ignore */ }
          } while (true);
  
          execute(1, mhs);
          mcs.setTarget(LOOKUP.findStatic(T.class, "f2", TYPE));
          execute(2, mhs);
      }
  
      public static void main(String[] args) throws Throwable {
          testSharedCallSite();
          testNonBoundCallSite();
!         testGC();
          System.out.println("TEST PASSED");
      }
  }
--- 162,201 ----
          int r = (int) mhs[0].invokeExact();
  
          execute(1, mhs);
  
          ref = new PhantomReference<>(cls[0], rq);
!         cls[0] = UNSAFE.defineAnonymousClass(Object.class, getClassFile("GC_3" + id), null);
          mhs[0] = LOOKUP.findStatic(cls[0], METHOD_NAME, TYPE);
  
          do {
              System.gc();
              try {
!                 Reference ref1 = rq.remove(100);
                  if (ref1 == ref) {
                      break;
                  }
              } catch(InterruptedException e) { /* ignore */ }
          } while (true);
  
+         if (clear) {
+             ref.clear();
+             System.gc(); // Ensure that the stale context is unloaded
+         }
+         if (precompile) {
              execute(1, mhs);
+         }
          mcs.setTarget(LOOKUP.findStatic(T.class, "f2", TYPE));
          execute(2, mhs);
      }
  
      public static void main(String[] args) throws Throwable {
+         testHiddenDepField();
          testSharedCallSite();
          testNonBoundCallSite();
!         testGC(false, false);
!         testGC(false,  true);
!         testGC( true, false);
!         testGC( true,  true);
          System.out.println("TEST PASSED");
      }
  }