--- /dev/null	2018-04-28 00:26:07.190086997 -0400
+++ new/test/hotspot/jtreg/runtime/Nestmates/privateFields/TestMethodHandles.java	2018-05-18 03:31:12.632127535 -0400
@@ -0,0 +1,276 @@
+/*
+ * Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+ * published by the Free Software Foundation.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+ * version 2 for more details (a copy is included in the LICENSE file that
+ * accompanied this code).
+ *
+ * You should have received a copy of the GNU General Public License version
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
+ * or visit www.oracle.com if you need additional information or have any
+ * questions.
+ */
+
+/*
+ * @test
+ * @bug 8046171
+ * @summary Test access to private fields between nestmates and nest-host
+ *          using different flavours of named nested types using MethodHandles
+ * @run main TestMethodHandles
+ */
+
+import java.lang.invoke.*;
+import static java.lang.invoke.MethodHandles.*;
+
+public class TestMethodHandles {
+
+    // Private field of nest-host for nestmates to access
+    private int priv_field;
+
+    // public constructor so we aren't relying on private access
+    public TestMethodHandles() {}
+
+    // Methods that will access private fields of nestmates
+
+    // NOTE: No StaticIface variants as interfaces can't have instance fields
+
+    void access_priv(TestMethodHandles o) throws Throwable {
+        MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+        this.priv_field = (int) mh.invoke(o);
+        this.priv_field = (int) mh.invokeExact(o);
+        checkBadInvokeG(mh, new StaticNested()); // wrong nestmate
+        checkBadInvokeG(mh, mh); // completely wrong type
+
+        mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+        mh.invoke(o, 2);
+        mh.invokeExact(o, 3);
+        checkBadInvokeS(mh, new StaticNested()); // wrong nestmate
+        checkBadInvokeS(mh, mh); // completely wrong type
+    }
+    void access_priv(InnerNested o) throws Throwable {
+        MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+        this.priv_field = (int) mh.invoke(o);
+        this.priv_field = (int) mh.invokeExact(o);
+        checkBadInvokeG(mh, this); // wrong nestmate
+        checkBadInvokeG(mh, mh); // completely wrong type
+
+        mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+        mh.invoke(o, 2);
+        mh.invokeExact(o, 3);
+        checkBadInvokeS(mh, this); // wrong nestmate
+        checkBadInvokeS(mh, mh); // completely wrong type
+    }
+    void access_priv(StaticNested o) throws Throwable {
+        MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+        this.priv_field = (int) mh.invoke(o);
+        this.priv_field = (int) mh.invokeExact(o);
+        checkBadInvokeG(mh, this); // wrong nestmate
+        checkBadInvokeG(mh, mh); // completely wrong type
+
+        mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+        mh.invoke(o, 2);
+        mh.invokeExact(o, 3);
+        checkBadInvokeS(mh, this); // wrong nestmate
+        checkBadInvokeS(mh, mh); // completely wrong type
+    }
+
+    // The various nestmates
+
+    static interface StaticIface {
+
+        // Methods that will access private fields of nestmates
+
+        default void access_priv(TestMethodHandles o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            int priv_field = (int) mh.invoke(o);
+            priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, this); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, this); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+        default void access_priv(InnerNested o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            int priv_field = (int) mh.invoke(o);
+            priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, this); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, this); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+        default void access_priv(StaticNested o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            int priv_field = (int) mh.invoke(o);
+            priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, this); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, this); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+    }
+
+    static class StaticNested {
+
+        private int priv_field;
+
+        // public constructor so we aren't relying on private access
+        public StaticNested() {}
+
+        // Methods that will access private fields of nestmates
+
+        void access_priv(TestMethodHandles o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            this.priv_field = (int) mh.invoke(o);
+            this.priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, this); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, this); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+        void access_priv(InnerNested o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            this.priv_field = (int) mh.invoke(o);
+            this.priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, this); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, this); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+        void access_priv(StaticNested o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            this.priv_field = (int) mh.invoke(o);
+            this.priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, new TestMethodHandles()); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, new TestMethodHandles()); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+    }
+
+    class InnerNested {
+
+        private int priv_field;
+
+        // public constructor so we aren't relying on private access
+        public InnerNested() {}
+
+        void access_priv(TestMethodHandles o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            this.priv_field = (int) mh.invoke(o);
+            this.priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, this); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, this); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+        void access_priv(InnerNested o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            this.priv_field = (int) mh.invoke(o);
+            this.priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, new StaticNested()); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, new StaticNested()); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+        void access_priv(StaticNested o) throws Throwable {
+            MethodHandle mh = lookup().findGetter(o.getClass(), "priv_field", int.class);
+            this.priv_field = (int) mh.invoke(o);
+            this.priv_field = (int) mh.invokeExact(o);
+            checkBadInvokeG(mh, this); // wrong nestmate
+            checkBadInvokeG(mh, mh); // completely wrong type
+
+            mh = lookup().findSetter(o.getClass(), "priv_field", int.class);
+            mh.invoke(o, 2);
+            mh.invokeExact(o, 3);
+            checkBadInvokeS(mh, this); // wrong nestmate
+            checkBadInvokeS(mh, mh); // completely wrong type
+        }
+    }
+
+    static void checkBadInvokeG(MethodHandle mh, Object o) throws Throwable {
+        try {
+            int x = (int) mh.invoke(o);
+            throw new Error("Invoke on MethodHandle " + mh + " with receiver "
+                            + o + "should have failed with ClassCastException!");
+        }
+        catch (ClassCastException expected) {
+            System.out.println("invoke got expected exception: " + expected);
+        }
+    }
+
+    static void checkBadInvokeS(MethodHandle mh, Object o) throws Throwable {
+        try {
+            mh.invoke(o, 42);
+            throw new Error("Invoke on MethodHandle " + mh + " with receiver "
+                            + o + "should have failed with ClassCastException!");
+         }
+         catch (ClassCastException expected) {
+             System.out.println("invoke got expected exception: " + expected);
+         }
+    }
+
+    public static void main(String[] args) throws Throwable {
+        TestMethodHandles o = new TestMethodHandles();
+        StaticNested s = new StaticNested();
+        InnerNested i = o.new InnerNested();
+        StaticIface intf = new StaticIface() {};
+
+        o.access_priv(new TestMethodHandles());
+        o.access_priv(i);
+        o.access_priv(s);
+
+        s.access_priv(o);
+        s.access_priv(i);
+        s.access_priv(new StaticNested());
+
+        i.access_priv(o);
+        i.access_priv(o.new InnerNested());
+        i.access_priv(s);
+
+        intf.access_priv(o);
+        intf.access_priv(i);
+        intf.access_priv(s);
+    }
+}