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

8278930: javac tries to compile a file twice via PackageElement.getEnclosedElements

Browse Source 
Reviewed-by: vromero
This commit is contained in:
Jan Lahoda 2022-01-10 09:30:55 +00:00
parent 642ab34a60
commit 8f969a1362
2 changed files with 158 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/jdk.compiler/share/classes/com/sun/tools/javac/code/ClassFinder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 1999, 2021, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 1999, 2022, 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
@ -292,10 +292,16 @@ public class ClassFinder {
ClassSymbol c = (ClassSymbol) sym;
dependencies.push(c, CompletionCause.CLASS_READER);
annotate.blockAnnotations();
c.members_field = new Scope.ErrorScope(c); // make sure it's always defined
Scope.ErrorScope members = new Scope.ErrorScope(c);
c.members_field = members; // make sure it's always defined
completeOwners(c.owner);
completeEnclosing(c);
//if an enclosing class is completed from the source,
//this class might have been completed already as well,
//avoid attempts to re-complete it:
if (c.members_field == members) {
fillIn(c);
}
} finally {
annotate.unblockAnnotationsNoFlush();
dependencies.pop();

149
test/langtools/tools/javac/processing/model/element/TestListPackageFromAPI.java Normal file
View File

@ -0,0 +1,149 @@
/*
* Copyright (c) 2022, 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 8278930
* @summary Check that when a package has Elements listed from both from classes and sources,
* and then a nested class is completed, it is not first completed from source via
* its enclosing class, and then again for itself.
* @library /tools/javac/lib
* @modules java.compiler
* jdk.compiler
* @run main TestListPackageFromAPI
*/
import com.sun.source.util.JavacTask;
import java.io.IOException;
import java.net.URI;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
import javax.lang.model.element.PackageElement;
import javax.tools.DiagnosticListener;
import javax.tools.ForwardingJavaFileManager;
import javax.tools.JavaFileManager;
import javax.tools.JavaFileObject;
import javax.tools.JavaFileObject.Kind;
import javax.tools.SimpleJavaFileObject;
import javax.tools.StandardLocation;
import javax.tools.ToolProvider;
public class TestListPackageFromAPI {
public static void main(String... args) throws IOException, URISyntaxException, InterruptedException {
try (JavaFileManager fm = ToolProvider.getSystemJavaCompiler().getStandardFileManager(null, null, null)) {
List<JavaFileObject> testClasses = List.of(
new TestFileObject("Test"),
new TestFileObject("Test$Nested")
);
List<JavaFileObject> testSources = List.of(
new TestFileObject("Test",
"""
class Test {
public static class Nested {}
}
""")
);
JavaFileManager testFM = new ForwardingJavaFileManagerImpl(fm, testClasses, testSources);
DiagnosticListener<JavaFileObject> noErrors = d -> { throw new AssertionError("Should not happen: " + d); };
JavacTask task = (JavacTask) ToolProvider.getSystemJavaCompiler().getTask(null, testFM, noErrors, null, null, List.of(new TestFileObject("Input", "")));
PackageElement pack = task.getElements().getPackageElement("");
pack.getEnclosedElements().forEach(e -> System.err.println(e));
}
}
private static class TestFileObject extends SimpleJavaFileObject {
private final String className;
private final String code;
public TestFileObject(String className) throws URISyntaxException {
super(new URI("mem://" + className + ".class"), Kind.CLASS);
this.className = className;
this.code = null;
}
public TestFileObject(String className, String code) throws URISyntaxException {
super(new URI("mem://" + className + ".java"), Kind.SOURCE);
this.className = className;
this.code = code;
}
@Override
public CharSequence getCharContent(boolean ignoreEncodingErrors) throws IOException {
if (code == null) {
throw new UnsupportedOperationException();
}
return code;
}
@Override
public long getLastModified() {
return getKind() == Kind.CLASS ? 0 : 1000;
}
}
private static class ForwardingJavaFileManagerImpl extends ForwardingJavaFileManager<JavaFileManager> {
private final List<JavaFileObject> testClasses;
private final List<JavaFileObject> testSources;
public ForwardingJavaFileManagerImpl(JavaFileManager fileManager, List<JavaFileObject> testClasses, List<JavaFileObject> testSources) {
super(fileManager);
this.testClasses = testClasses;
this.testSources = testSources;
}
@Override
public Iterable<JavaFileObject> list(JavaFileManager.Location location, String packageName, Set<JavaFileObject.Kind> kinds, boolean recurse) throws IOException {
if (packageName.isEmpty()) {
List<JavaFileObject> result = new ArrayList<>();
if (location == StandardLocation.CLASS_PATH && kinds.contains(Kind.CLASS)) {
result.addAll(testClasses);
} else if (location == StandardLocation.SOURCE_PATH && kinds.contains(Kind.SOURCE)) {
result.addAll(testSources);
}
return result;
}
return super.list(location, packageName, kinds, recurse);
}
@Override
public boolean hasLocation(Location location) {
return location == StandardLocation.CLASS_PATH ||
location == StandardLocation.SOURCE_PATH ||
super.hasLocation(location);
}
@Override
public String inferBinaryName(JavaFileManager.Location location, JavaFileObject file) {
if (file instanceof TestFileObject testFO) {
return testFO.className;
}
return super.inferBinaryName(location, file);
}
}
}