infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-16 10:53:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

8189335: javac exception when referencing private inner class with same name as normal class with dollar_1

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Bernard Blaser 2018-06-04 10:12:40 -07:00
parent 48e6db9ca8
commit 8d24eeb394
2 changed files with 92 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java
View File

@ -1257,15 +1257,19 @@ public class Lower extends TreeTranslator {
ClassSymbol accessConstructorTag() {
ClassSymbol topClass = currentClass.outermostClass();
ModuleSymbol topModle = topClass.packge().modle;
Name flatname = names.fromString("" + topClass.getQualifiedName() +
target.syntheticNameChar() +
"1");
ClassSymbol ctag = chk.getCompiled(topModle, flatname);
if (ctag == null)
ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass).sym;
// keep a record of all tags, to verify that all are generated as required
accessConstrTags = accessConstrTags.prepend(ctag);
return ctag;
for (int i = 1; ; i++) {
Name flatname = names.fromString("" + topClass.getQualifiedName() +
target.syntheticNameChar() +
i);
ClassSymbol ctag = chk.getCompiled(topModle, flatname);
if (ctag == null)
ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass).sym;
else if (!ctag.isAnonymous())
continue;
// keep a record of all tags, to verify that all are generated as required
accessConstrTags = accessConstrTags.prepend(ctag);
return ctag;
}
}
/** Add all required access methods for a private symbol to enclosing class.

79
test/langtools/tools/javac/classfiles/attributes/Synthetic/AccessToPrivateInnerClassConstructorsTest.java Normal file
View File

@ -0,0 +1,79 @@
/*
* Copyright (c) 2018, 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 8189335
* @summary Synthetic anonymous class used as access constructor tag conflicting with a top level class.
* @modules jdk.compiler/com.sun.tools.javac.api
* jdk.compiler/com.sun.tools.javac.main
* jdk.jdeps/com.sun.tools.classfile
* @library /tools/lib /tools/javac/lib ../lib
* @build toolbox.ToolBox InMemoryFileManager TestResult
* @build AccessToPrivateInnerClassConstructorsTest SyntheticTestDriver ExpectedClass ExpectedClasses
* @run main SyntheticTestDriver AccessToPrivateInnerClassConstructorsTest 1
* @run main AccessToPrivateInnerClassConstructorsTest
*/
@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest",
expectedMethods = {"<init>()", "main(java.lang.String[])", "f()", "g()"})
@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$1",
expectedMethods = {"<init>()"})
@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$A",
expectedMethods = {
"<init>(AccessToPrivateInnerClassConstructorsTest)",
"<init>(AccessToPrivateInnerClassConstructorsTest, " +
"AccessToPrivateInnerClassConstructorsTest$1)"},
expectedNumberOfSyntheticFields = 1,
expectedNumberOfSyntheticMethods = 2)
@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$1Local",
expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"},
expectedNumberOfSyntheticFields = 1)
@ExpectedClass(className = "AccessToPrivateInnerClassConstructorsTest$2Local",
expectedMethods = {"<init>(AccessToPrivateInnerClassConstructorsTest)"},
expectedNumberOfSyntheticFields = 1)
public class AccessToPrivateInnerClassConstructorsTest {
public static void main(String... args) {
new AccessToPrivateInnerClassConstructorsTest().f();
}
private class A {
private A() { }
private A(AccessToPrivateInnerClassConstructorsTest$1 o) { }
}
void f() {
new A();
new A(null);
class Local {};
new Local();
}
void g() {
class Local {};
new Local();
}
}
class AccessToPrivateInnerClassConstructorsTest$1 {}