infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-03-19 04:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

7142672: Problems with the value passed to the 'classes' param of JavaCompiler.CompilationTask.getTask(...)

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Jim Holmlund 2012-02-13 16:01:43 -08:00
parent 0073cdd512
commit df7b871807
5 changed files with 182 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
langtools/src/share/classes/com/sun/tools/javac/main/JavaCompiler.java
View File

@ -1077,7 +1077,9 @@ public class JavaCompiler implements ClassReader.SourceCompleter {
boolean errors = false;
for (String nameStr : classnames) {
Symbol sym = resolveBinaryNameOrIdent(nameStr);
if (sym == null || (sym.kind == Kinds.PCK && !processPcks)) {
if (sym == null ||
(sym.kind == Kinds.PCK && !processPcks) ||
sym.kind == Kinds.ABSENT_TYP) {
log.error("proc.cant.find.class", nameStr);
errors = true;
continue;

44
langtools/test/tools/javac/T7142672/AnnoProcessor.java Normal file
View File

@ -0,0 +1,44 @@
/*
* Copyright (c) 2012, 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.
*/
import java.util.Set;
import javax.annotation.processing.*;
import javax.lang.model.SourceVersion;
import javax.lang.model.element.TypeElement;
@SupportedAnnotationTypes("Anno")
public class AnnoProcessor extends AbstractProcessor {
@Override
public SourceVersion getSupportedSourceVersion() {
return SourceVersion.latest();
}
@Override
public boolean process(Set<? extends TypeElement> set, RoundEnvironment re) {
System.out.println("RUNNING...");
if(set.isEmpty()) {
return false;
}
return false;
}
}

85
langtools/test/tools/javac/T7142672/Bug.java Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright (c) 2012, 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 7142672
* @summary Problems with the value passed to the 'classes' param of JavaCompiler.CompilationTask.getTask(...)
* @author holmlund
* @compile AnnoProcessor.java Bug.java Test3.java
* @run main Bug Test2.java
* @run main Bug Test2.foo
* @run main Bug Test3.java
*/
import java.io.*;
import java.util.*;
import javax.tools.*;
// Each run should output the 'could not find class file' message, and not throw an AssertError.
public class Bug {
public static void main(String... arg) throws Throwable {
String name = arg[0];
final String expectedMsg = "error: Could not find class file for '" + name + "'.";
JavaCompiler javac = ToolProvider.getSystemJavaCompiler();
JavaCompiler.CompilationTask task2;
StringWriter sw = new StringWriter();
final PrintWriter pw = new PrintWriter(sw);
DiagnosticListener<? super javax.tools.JavaFileObject> dl =
new DiagnosticListener<javax.tools.JavaFileObject>() {
public void report(Diagnostic message) {
pw.print("Diagnostic:\n"+ message.toString()+"\n");
if (!message.toString().equals(expectedMsg)){
System.err.println("Diagnostic:\n"+ message.toString()+"\n");
System.err.println("--Failed: Unexpected diagnostic");
System.exit(1);
}
}
};
StandardJavaFileManager sjfm = javac.getStandardFileManager(dl,null,null);
List<String> opts = new ArrayList<String>();
opts.add("-proc:only");
opts.add("-processor");
opts.add("AnnoProcessor");
boolean xxx;
System.err.println("\n-- " + name);
task2 = javac.getTask(pw, sjfm, dl, opts, Arrays.asList(name), null);
xxx = task2.call();
String out = sw.toString();
System.err.println(out);
if (out.contains("Assert")) {
System.err.println("--Failed: Assertion failure");
System.exit(1);
}
if (!out.contains(expectedMsg)) {
System.err.println("--Failed: Expected diagnostic not found");
System.exit(1);
}
}
}

25
langtools/test/tools/javac/T7142672/Test2.java Normal file
View File

@ -0,0 +1,25 @@
/*
* Copyright (c) 2012, 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.
*/
class Test2 {
}

25
langtools/test/tools/javac/T7142672/Test3.java Normal file
View File

@ -0,0 +1,25 @@
/*
* Copyright (c) 2012, 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.
*/
class Test3 {
}