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

6917288: Unnamed nested class is not generated

Browse Source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2010-06-24 10:34:53 -07:00
parent 5b2078e713
commit 17e9572501
4 changed files with 362 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
langtools/src/share/classes/com/sun/tools/javac/comp/Lower.java
View File

@ -674,6 +674,40 @@ public class Lower extends TreeTranslator {
return rs.resolveInternalField(pos, attrEnv, qual, name);
}
/** Anon inner classes are used as access constructor tags.
* accessConstructorTag will use an existing anon class if one is available,
* and synthethise a class (with makeEmptyClass) if one is not available.
* However, there is a small possibility that an existing class will not
* be generated as expected if it is inside a conditional with a constant
* expression. If that is found to be the case, create an empty class here.
*/
private void checkAccessConstructorTags() {
for (List<ClassSymbol> l = accessConstrTags; l.nonEmpty(); l = l.tail) {
ClassSymbol c = l.head;
if (isTranslatedClassAvailable(c))
continue;
// Create class definition tree.
JCClassDecl cdef = make.ClassDef(
make.Modifiers(STATIC | SYNTHETIC), names.empty,
List.<JCTypeParameter>nil(),
null, List.<JCExpression>nil(), List.<JCTree>nil());
cdef.sym = c;
cdef.type = c.type;
// add it to the list of classes to be generated
translated.append(cdef);
}
}
// where
private boolean isTranslatedClassAvailable(ClassSymbol c) {
for (JCTree tree: translated) {
if (tree.getTag() == JCTree.CLASSDEF
&& ((JCClassDecl) tree).sym == c) {
return true;
}
}
return false;
}
/**************************************************************************
* Access methods
*************************************************************************/
@ -718,6 +752,10 @@ public class Lower extends TreeTranslator {
*/
private Map<Symbol,MethodSymbol> accessConstrs;
/** A list of all class symbols used for access constructor tags.
*/
private List<ClassSymbol> accessConstrTags;
/** A queue for all accessed symbols.
*/
private ListBuffer<Symbol> accessed;
@ -1138,6 +1176,8 @@ public class Lower extends TreeTranslator {
ClassSymbol ctag = chk.compiled.get(flatname);
if (ctag == null)
ctag = makeEmptyClass(STATIC | SYNTHETIC, topClass);
// keep a record of all tags, to verify that all are generated as required
accessConstrTags = accessConstrTags.prepend(ctag);
return ctag;
}
@ -3394,6 +3434,7 @@ public class Lower extends TreeTranslator {
accessNums = new HashMap<Symbol,Integer>();
accessSyms = new HashMap<Symbol,MethodSymbol[]>();
accessConstrs = new HashMap<Symbol,MethodSymbol>();
accessConstrTags = List.nil();
accessed = new ListBuffer<Symbol>();
translate(cdef, (JCExpression)null);
for (List<Symbol> l = accessed.toList(); l.nonEmpty(); l = l.tail)
@ -3401,6 +3442,7 @@ public class Lower extends TreeTranslator {
for (EnumMapping map : enumSwitchMap.values())
map.translate();
checkConflicts(this.translated.toList());
checkAccessConstructorTags();
translated = this.translated;
} finally {
// note that recursive invocations of this method fail hard
@ -3420,6 +3462,7 @@ public class Lower extends TreeTranslator {
accessNums = null;
accessSyms = null;
accessConstrs = null;
accessConstrTags = null;
accessed = null;
enumSwitchMap.clear();
}

55
langtools/test/tools/javac/6917288/GraphicalInstaller.java Normal file
View File

@ -0,0 +1,55 @@
/*
* Copyright (c) 2010, 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.
*/
/**
* Complex example for the "access constructor tags" issue.
* This test causes Lower to evaluate all classes defined in installNext
* before they are lowered, thus preventing the use of Lower.classdefs
* as a way of determining whether a class has been translated or not.
*/
class GraphicalInstaller {
private BackgroundInstaller backgroundInstaller;
private void installNext() {
final Integer x = 0;
class X {
Object o = new Object() { int y = x; };
};
new X();
if (false) {
new Runnable(){
public void run() {
}
};
}
}
private void installSuiteCommon() {
backgroundInstaller = new BackgroundInstaller();
}
private static class BackgroundInstaller {
private BackgroundInstaller() {
}
}
}

106
langtools/test/tools/javac/6917288/GraphicalInstallerTest.java Normal file
View File

@ -0,0 +1,106 @@
/*
* Copyright (c) 2010, 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 6917288
* @summary Unnamed nested class is not generated
*/
import java.io.*;
import java.util.*;
public class GraphicalInstallerTest {
public static void main(String... args) throws Exception {
new GraphicalInstallerTest().run();
}
void run() throws Exception {
File testSrc = new File(System.getProperty("test.src"));
File classes = new File("classes");
classes.mkdirs();
List<String> opts = Arrays.asList("-d", classes.getPath());
int rc = compile(opts, new File(testSrc, "GraphicalInstaller.java"));
if (rc != 0) {
error("compilation failed: rc=" + rc);
return;
}
check(classes,
"GraphicalInstaller$1.class",
"GraphicalInstaller$1X$1.class",
"GraphicalInstaller$1X.class",
"GraphicalInstaller$BackgroundInstaller.class",
"GraphicalInstaller.class");
if (errors > 0)
throw new Exception(errors + " errors occurred");
}
/**
* Compile files with given options.
* Display any output from compiler, and return javac return code.
*/
int compile(List<String> opts, File... files) {
List<String> args = new ArrayList<String>();
args.addAll(opts);
for (File f: files)
args.add(f.getPath());
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw);
pw.close();
String out = sw.toString();
if (out.length() > 0)
System.err.println(out);
return rc;
}
/**
* Check that a directory contains the expected files.
*/
void check(File dir, String... paths) {
Set<String> found = new TreeSet<String>(Arrays.asList(dir.list()));
Set<String> expect = new TreeSet<String>(Arrays.asList(paths));
if (found.equals(expect))
return;
for (String f: found) {
if (!expect.contains(f))
error("Unexpected file found: " + f);
}
for (String e: expect) {
if (!found.contains(e))
error("Expected file not found: " + e);
}
}
/**
* Record an error message.
*/
void error(String msg) {
System.err.println(msg);
errors++;
}
int errors;
}

158
langtools/test/tools/javac/6917288/T6917288.java Normal file
View File

@ -0,0 +1,158 @@
/*
* Copyright (c) 2010, 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 6917288
* @summary Unnamed nested class is not generated
*/
import java.io.*;
import java.util.*;
public class T6917288 {
// refers to kind of reference to an anon inner class that may be generated
enum Kind { NONE, FALSE, TRUE, ALWAYS };
public static void main(String... args) throws Exception {
new T6917288().run();
}
void run() throws Exception {
for (Kind k: Kind.values()) {
test(k);
}
if (errors > 0)
throw new Exception(errors + " errors occurred");
}
/**
* Run a test case for Kind k.
*/
void test(Kind k) throws Exception {
System.err.println("Test " + (++count) + ": " + k);
File testDir = new File("test" + count);
File srcDir = new File(testDir, "src");
srcDir.mkdirs();
File classesDir = new File(testDir, "classes");
classesDir.mkdirs();
List<String> opts = new ArrayList<String>();
opts.add("-d");
opts.add(classesDir.getPath());
File f = writeFile(srcDir, k);
int rc = compile(opts, f);
if (rc != 0) {
error("compilation failed: rc=" + rc);
return;
}
check(classesDir, "Test.class", "Test$Inner.class", "Test$1.class");
}
/**
* Compile files with given options.
* Display any output from compiler, and return javac return code.
*/
int compile(List<String> opts, File... files) {
List<String> args = new ArrayList<String>();
args.addAll(opts);
for (File f: files)
args.add(f.getPath());
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
int rc = com.sun.tools.javac.Main.compile(args.toArray(new String[args.size()]), pw);
pw.close();
String out = sw.toString();
if (out.length() > 0)
System.err.println(out);
return rc;
}
/**
* Check that a directory contains the expected files.
*/
void check(File dir, String... paths) {
Set<String> found = new TreeSet<String>(Arrays.asList(dir.list()));
Set<String> expect = new TreeSet<String>(Arrays.asList(paths));
if (found.equals(expect))
return;
for (String f: found) {
if (!expect.contains(f))
error("Unexpected file found: " + f);
}
for (String e: expect) {
if (!found.contains(e))
error("Expected file not found: " + e);
}
}
/**
* Write source file for test case k.
*/
File writeFile(File dir, Kind k) throws Exception {
StringBuilder sb = new StringBuilder();
sb.append("public class Test {\n");
sb.append(" private Inner inner;\n");
// generate different cases of an anon inner class
if (k != Kind.NONE) {
sb.append(" private void m() {\n");
sb.append(" ");
switch (k) {
case FALSE: case TRUE:
sb.append("if (" + k.toString().toLowerCase() + ") ");
}
sb.append("new Runnable() { public void run() { } };\n");
sb.append(" }\n");
}
sb.append(" private void init() {\n");
sb.append(" inner = new Inner();\n");
sb.append(" }\n");
sb.append("\n");
sb.append(" private static class Inner {\n");
sb.append(" private Inner() {\n");
sb.append(" }\n");
sb.append(" }\n");
sb.append("}\n");
File f = new File(dir, "Test.java");
FileWriter w = new FileWriter(f);
w.write(sb.toString());
w.close();
return f;
}
/**
* Record an error message.
*/
void error(String msg) {
System.err.println(msg);
errors++;
}
int count;
int errors;
}