# HG changeset patch
# User rfield
# Date 1382549290 25200
# Node ID 32ea6ccb7607740bc77e88aeb4b6c0959cc793aa
# Parent  b05db8c815e8034c9395ba4709120939229b1cde
8022720: Method refeerences - private method should be accessible (nested classes)
Reviewed-by: jjg, ksrini

diff -r b05db8c815e8 -r 32ea6ccb7607 src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java
--- a/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Wed Oct 23 07:50:04 2013 +0200
+++ b/src/share/classes/com/sun/tools/javac/comp/LambdaToMethod.java	Wed Oct 23 10:28:10 2013 -0700
@@ -2087,13 +2087,6 @@
                 return tree.sym.owner == syms.arrayClass;
             }
 
-            boolean isPrivateConstructor() {
-                //hack needed to workaround 292 bug (8005122)
-                //when 292 issue is fixed we should simply remove this
-                return tree.sym.name == names.init &&
-                        (tree.sym.flags() & PRIVATE) != 0;
-            }
-
             boolean receiverAccessible() {
                 //hack needed to workaround 292 bug (7087658)
                 //when 292 issue is fixed we should remove this and change the backend
@@ -2102,12 +2095,24 @@
             }
 
             /**
+             * The VM does not support access across nested classes (8010319).
+             * Were that ever to change, this should be removed.
+             */
+            boolean isPrivateInOtherClass() {
+                return  (tree.sym.flags() & PRIVATE) != 0 &&
+                        !types.isSameType(
+                              types.erasure(tree.sym.enclClass().asType()),
+                              types.erasure(owner.enclClass().asType()));
+            }
+
+            /**
              * Does this reference needs a bridge (i.e. var args need to be
              * expanded or "super" is used)
              */
             final boolean needsBridge() {
                 return isSuper || needsVarArgsConversion() || isArrayOp() ||
-                        isPrivateConstructor() || !receiverAccessible();
+                        isPrivateInOtherClass() ||
+                        !receiverAccessible();
             }
 
             Type generatedRefSig() {
diff -r b05db8c815e8 -r 32ea6ccb7607 test/tools/javac/lambda/privateMethodReferences/MethodInvoker.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/privateMethodReferences/MethodInvoker.java	Wed Oct 23 10:28:10 2013 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013, 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 8022720
+ * @summary private method should be accessible (nested classes)
+ * @run main MethodInvoker
+ */
+
+interface MyFunctionalInterface1 {
+    int invokeMethodReference();
+}
+
+public class MethodInvoker {
+    public static void main(String[] args) throws Exception {
+        MethodInvoker.invoke();
+        System.out.println("Passed!");
+    }
+    public static void invoke() throws Exception {
+        MethodSupplier ms = new MethodSupplier();
+        MyFunctionalInterface1 fi = ms::m;
+        if (fi.invokeMethodReference() != 123) {
+            throw new Exception();
+        }
+    }
+    static class MethodSupplier {
+        private int m() {
+            return 123;
+        }
+    }
+}
diff -r b05db8c815e8 -r 32ea6ccb7607 test/tools/javac/lambda/privateMethodReferences/MethodSupplier.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/privateMethodReferences/MethodSupplier.java	Wed Oct 23 10:28:10 2013 -0700
@@ -0,0 +1,52 @@
+/*
+ * Copyright (c) 2013, 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 8022720
+ * @summary private method should be accessible (nested classes)
+ * @run main MethodSupplier
+ */
+
+interface MyFunctionalInterface2 {
+    int invokeMethodReference();
+}
+
+public class MethodSupplier {
+    public static void main(String[] args) throws Exception {
+        MethodInvoker.invoke();
+        System.out.println("Passed!");
+    }
+    private int m() {
+        return 4321;
+    }
+    static class MethodInvoker {
+        public static void invoke() throws Exception {
+            MethodSupplier ms = new MethodSupplier();
+            MyFunctionalInterface2 fi = ms::m;
+            if (fi.invokeMethodReference() != 4321) {
+                throw new Exception();
+            }
+        }
+    }
+}
diff -r b05db8c815e8 -r 32ea6ccb7607 test/tools/javac/lambda/privateMethodReferences/ThirdClass.java
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/test/tools/javac/lambda/privateMethodReferences/ThirdClass.java	Wed Oct 23 10:28:10 2013 -0700
@@ -0,0 +1,55 @@
+/*
+ * Copyright (c) 2013, 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 8022720
+ * @summary private method should be accessible (nested classes)
+ * @run main ThirdClass
+ */
+
+interface MyFunctionalInterface3 {
+    int invokeMethodReference();
+}
+
+public class ThirdClass {
+    public static void main(String[] args) throws Exception {
+        MethodInvoker.invoke();
+        System.out.println("Passed!");
+    }
+    static class MethodSupplier {
+        private int m() {
+            return 999;
+        }
+    }
+
+    static class MethodInvoker {
+        public static void invoke() throws Exception {
+            MethodSupplier ms = new MethodSupplier();
+            MyFunctionalInterface3 fi = ms::m;
+            if (fi.invokeMethodReference() != 999) {
+                throw new Exception();
+            }
+        }
+    }
+}