Mercurial > hg > jdk9-shenandoah > langtools
changeset 2956:8d7f82e6d1b5
8081521: Compiler has trouble compiling nested diamond allocation constructs involving anonymous classes.
Reviewed-by: mcimadamore
author | sadayapalam |
---|---|
date | Fri, 05 Jun 2015 18:43:11 +0530 |
parents | c71857c93f57 |
children | 098657cc98c9 |
files | src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java |
diffstat | 2 files changed, 62 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Thu Jun 04 18:50:30 2015 -0700 +++ b/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java Fri Jun 05 18:43:11 2015 +0530 @@ -2175,11 +2175,19 @@ 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)) {
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java Fri Jun 05 18:43:11 2015 +0530 @@ -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<>() { + }); + } +}