--- old/test/runtime/Nestmates/privateMethods/TestMethodHandles.java	2017-09-15 03:00:02.963007303 -0400
+++ new/test/runtime/Nestmates/privateMethods/TestMethodHandles.java	2017-09-15 03:00:00.830886376 -0400
@@ -26,8 +26,7 @@
  * @bug 8046171
  * @summary Test access to private methods between nestmates and nest-top
  *          using different flavours of named nested types using MethodHandles
- * @compile -XDdisablePrivateAccessors TestMethodHandles.java
- * @run main TestMethodHandles
+  * @run main TestMethodHandles
  */
 
 
@@ -50,7 +49,7 @@
     // Methods that will access private methods of nestmates
 
     void access_priv(TestMethodHandles o) throws Throwable {
-        MethodHandle mh = 
+        MethodHandle mh =
           lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
         mh.invoke(o);
         mh.invokeExact(o);
@@ -58,7 +57,7 @@
         checkBadInvoke(mh, mh); // completely wrong type
     }
     void access_priv(InnerNested o) throws Throwable {
-        MethodHandle mh = 
+        MethodHandle mh =
           lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
         mh.invoke(o);
         mh.invokeExact(o);
@@ -66,7 +65,7 @@
         checkBadInvoke(mh, mh); // completely wrong type
     }
     void access_priv(StaticNested o) throws Throwable {
-        MethodHandle mh = 
+        MethodHandle mh =
           lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
         mh.invoke(o);
         mh.invokeExact(o);
@@ -74,7 +73,7 @@
         checkBadInvoke(mh, mh); // completely wrong type
     }
     void access_priv(StaticIface o) throws Throwable {
-        MethodHandle mh = 
+        MethodHandle mh =
           lookup().findSpecial(StaticIface.class, "priv_invoke", M_T, this.getClass());
         mh.invoke(o);
         mh.invokeExact(o);
@@ -93,7 +92,7 @@
         // Methods that will access private methods of nestmates
 
         default void access_priv(TestMethodHandles o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, StaticIface.class);
             mh.invoke(o);
             mh.invokeExact(o);
@@ -101,7 +100,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         default void access_priv(InnerNested o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, StaticIface.class);
             mh.invoke(o);
             mh.invokeExact(o);
@@ -109,7 +108,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         default void access_priv(StaticNested o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, StaticIface.class);
             mh.invoke(o);
             mh.invokeExact(o);
@@ -117,7 +116,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         default void access_priv(StaticIface o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(StaticIface.class, "priv_invoke", M_T, StaticIface.class);
             mh.invoke(o);
             mh.invokeExact(o);
@@ -138,7 +137,7 @@
         // Methods that will access private methods of nestmates
 
         void access_priv(TestMethodHandles o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);
@@ -146,7 +145,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         void access_priv(InnerNested o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);
@@ -154,7 +153,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         void access_priv(StaticNested o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);
@@ -162,7 +161,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         void access_priv(StaticIface o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(StaticIface.class, "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);
@@ -181,7 +180,7 @@
         public InnerNested() {}
 
         void access_priv(TestMethodHandles o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);
@@ -189,7 +188,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         void access_priv(InnerNested o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);
@@ -197,7 +196,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         void access_priv(StaticNested o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(o.getClass(), "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);
@@ -205,7 +204,7 @@
             checkBadInvoke(mh, mh); // completely wrong type
         }
         void access_priv(StaticIface o) throws Throwable {
-            MethodHandle mh = 
+            MethodHandle mh =
               lookup().findSpecial(StaticIface.class, "priv_invoke", M_T, this.getClass());
             mh.invoke(o);
             mh.invokeExact(o);