--- old/test/hotspot/jtreg/runtime/Nestmates/privateStaticMethods/TestReflection.java	2017-10-11 03:37:07.264509543 -0400
+++ new/test/hotspot/jtreg/runtime/Nestmates/privateStaticMethods/TestReflection.java	2017-10-11 03:37:05.712421432 -0400
@@ -27,8 +27,15 @@
  * @summary Test access to private static methods between nestmates and nest-top
  *          using different flavours of named nested types using core reflection
  * @run main TestReflection
+ * @run main/othervm -Dsun.reflect.noInflation=true TestReflection
  */
 
+// The first run will use NativeMethodAccessor and due to the limited number
+// of calls we will not reach the inflation threshold.
+// The second run disables inflation so we will use the GeneratedMethodAccessor
+// instead. In this way both sets of Reflection classes are tested.
+
+
 public class TestReflection {
 
     // Private method of nest-top for nestmates to access
@@ -39,6 +46,8 @@
     // public constructor so we aren't relying on private access
     public TestReflection() {}
 
+    // We test access via getClass() as well as Foo.class
+
     // Methods that will access private static methods of nestmates
 
     // NOTE: No InnerNested calls in this test because non-static nested types
@@ -46,11 +55,14 @@
 
     void access_priv(TestReflection o) throws Throwable {
         o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+        TestReflection.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
     }
     void access_priv(StaticNested o) throws Throwable {
         o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+        StaticNested.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
     }
     void access_priv(StaticIface o) throws Throwable {
+        // Can't use o.getClass() as the method is not in that class
         StaticIface.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
     }
 
@@ -66,11 +78,14 @@
 
         default void access_priv(TestReflection o) throws Throwable {
             o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+            TestReflection.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
         default void access_priv(StaticNested o) throws Throwable {
             o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+            StaticNested.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
         default void access_priv(StaticIface o) throws Throwable {
+            // Can't use o.getClass() as the method is not in that class
             StaticIface.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
     }
@@ -88,11 +103,14 @@
 
         void access_priv(TestReflection o) throws Throwable {
             o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+            TestReflection.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
         void access_priv(StaticNested o) throws Throwable {
             o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+            StaticNested.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
         void access_priv(StaticIface o) throws Throwable {
+            // Can't use o.getClass() as the method is not in that class
             StaticIface.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
     }
@@ -104,11 +122,14 @@
 
         void access_priv(TestReflection o) throws Throwable {
             o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+            TestReflection.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
         void access_priv(StaticNested o) throws Throwable {
             o.getClass().getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
+            StaticNested.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
         void access_priv(StaticIface o) throws Throwable {
+            // Can't use o.getClass() as the method is not in that class
             StaticIface.class.getDeclaredMethod("priv_static_invoke", new Class<?>[0]).invoke(null, new Object[0]);
         }
     }