stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8081521: Compiler has trouble compiling nested diamond allocation constructs involving anonymous classes

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Srikanth Adayapalam 2015-06-05 18:43:11 +05:30
parent d35b2d378b
commit 7dd4ada04b
2 changed files with 62 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
View File

@ -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)) {

53
langtools/test/tools/javac/generics/diamond/pos/NestedDiamondAllocationTest.java Normal file
View File

@ -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<>() {
});
}
}