From 7dd4ada04becf3712d741616b3f1fb392fbafb8b Mon Sep 17 00:00:00 2001
From: Srikanth Adayapalam <sadayapalam@openjdk.org>
Date: Fri, 5 Jun 2015 18:43:11 +0530
Subject: [PATCH] 8081521: Compiler has trouble compiling nested diamond
 allocation constructs involving anonymous classes

Reviewed-by: mcimadamore
---
 .../com/sun/tools/javac/comp/Attr.java        | 10 +++-
 .../pos/NestedDiamondAllocationTest.java      | 53 +++++++++++++++++++
 2 files changed, 62 insertions(+), 1 deletion(-)
 create mode 100644 langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java

diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
index 9c7336af396..892410f9986 100644
--- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
+++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
@@ -2175,11 +2175,19 @@ public class Attr extends JCTree.Visitor {
             if (isDiamond
                     && ((tree.constructorType != null && inferenceContext.free(tree.constructorType))
                     || (tree.clazz.type != null && inferenceContext.free(tree.clazz.type)))) {
+                final ResultInfo resultInfoForClassDefinition = this.resultInfo;
                 inferenceContext.addFreeTypeListener(List.of(tree.constructorType, tree.clazz.type),
                         instantiatedContext -> {
                             tree.constructorType = instantiatedContext.asInstType(tree.constructorType);
                             clazz.type = instantiatedContext.asInstType(clazz.type);
-                            visitAnonymousClassDefinition(tree, clazz, clazz.type, cdef, localEnv, argtypes, typeargtypes, pkind);
+                            ResultInfo prevResult = this.resultInfo;
+                            try {
+                                this.resultInfo = resultInfoForClassDefinition;
+                                visitAnonymousClassDefinition(tree, clazz, clazz.type, cdef,
+                                                            localEnv, argtypes, typeargtypes, pkind);
+                            } finally {
+                                this.resultInfo = prevResult;
+                            }
                         });
             } else {
                 if (isDiamond && clazztype.hasTag(CLASS)) {
diff --git a/langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java b/langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java
new file mode 100644
index 00000000000..7805e58b39b
--- /dev/null
+++ b/langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 2015 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 8081521
+ * @summary Ensure that anonymous class construction using <> can be nested within another
+ * @compile NestedDiamondAllocationTest.java
+ * @run main NestedDiamondAllocationTest
+ *
+ */
+
+public class NestedDiamondAllocationTest {
+    static class Clazz2 {
+        static class A {
+        };
+        public A a;
+    }
+    static class FooNest<Q> {
+        FooNest(Q q, Foo<Q> foo) {
+        }
+    }
+
+    static class Foo<T> {
+    }
+
+    static Clazz2 clazz = new Clazz2();
+
+    public static void main(String [] args) {
+        FooNest fooNest = new FooNest<>(clazz.a, new Foo<>() {
+        });
+    }
+}