archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 19:44:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8022162: Incorrect signature determination for certain inner class generics

Browse source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2013-09-02 22:44:06 +01:00
parent 0382c78ff1
commit 46d7a993ad
2 changed files with 104 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

21
langtools/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java
View file

@ -727,12 +727,14 @@ public class ClassReader implements Completer {
ClassSymbol t = enterClass(names.fromUtf(signatureBuffer,
startSbp,
sbp - startSbp));
if (outer == Type.noType)
outer = t.erasure(types);
else
outer = new ClassType(outer, List.<Type>nil(), t);
sbp = startSbp;
return outer;
try {
return (outer == Type.noType) ?
t.erasure(types) :
new ClassType(outer, List.<Type>nil(), t);
} finally {
sbp = startSbp;
}
}
case '<': // generic arguments
@ -797,6 +799,13 @@ public class ClassReader implements Completer {
continue;
case '.':
//we have seen an enclosing non-generic class
if (outer != Type.noType) {
t = enterClass(names.fromUtf(signatureBuffer,
startSbp,
sbp - startSbp));
outer = new ClassType(outer, List.<Type>nil(), t);
}
signatureBuffer[sbp++] = (byte)'$';
continue;
case '/':

89
langtools/test/tools/javac/T8022162/IncorrectSignatureDeterminationForInnerClassesTest.java Normal file
View file

@ -0,0 +1,89 @@
/*
* 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 8022162
* @summary Incorrect signature determination for certain inner class generics
* @library /tools/javac/lib
* @build ToolBox
* @run main IncorrectSignatureDeterminationForInnerClassesTest
*/
import java.nio.file.Files;
import java.nio.file.Paths;
public class IncorrectSignatureDeterminationForInnerClassesTest {
private static final String DSrc =
"package p1;\n" +
"public class D<T> {\n" +
"}\n" +
"abstract class Q<T> {\n" +
" protected void m(M.E e) {}\n" +
" public class M extends D<T> {\n" +
" public class E {}\n" +
" }\n" +
"}";
private static final String HSrc =
"package p1;\n" +
"public class H {\n" +
" static class EQ extends Q<Object> {\n" +
" private void m2(M.E item) {\n" +
" m(item);\n" +
" }\n" +
" }\n" +
"}";
public static void main(String args[]) throws Exception {
new IncorrectSignatureDeterminationForInnerClassesTest().run();
}
void run() throws Exception {
compile();
}
void compile() throws Exception {
Files.createDirectory(Paths.get("classes"));
ToolBox.JavaToolArgs javacParams =
new ToolBox.JavaToolArgs()
.appendArgs("-d", "classes")
.setSources(DSrc);
ToolBox.javac(javacParams);
// compile class H against the class files for classes D and Q
javacParams =
new ToolBox.JavaToolArgs()
.appendArgs("-d", "classes", "-cp", "classes")
.setSources(HSrc);
ToolBox.javac(javacParams);
}
}