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

8008276: assertion error in com.sun.tools.javac.comp.TransTypes.visitApply

Browse Source 
DiagnosticFilter used during speculative attribution is too broad

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2013-02-21 15:21:38 +00:00
parent eb68b33185
commit 937b7d2fba
4 changed files with 41 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
langtools/src/share/classes/com/sun/tools/javac/comp/DeferredAttr.java
View File

@ -276,14 +276,27 @@ public class DeferredAttr extends JCTree.Visitor {
* disabled during speculative type-checking.
*/
JCTree attribSpeculative(JCTree tree, Env<AttrContext> env, ResultInfo resultInfo) {
JCTree newTree = new TreeCopier<Object>(make).copy(tree);
final JCTree newTree = new TreeCopier<Object>(make).copy(tree);
Env<AttrContext> speculativeEnv = env.dup(newTree, env.info.dup(env.info.scope.dupUnshared()));
speculativeEnv.info.scope.owner = env.info.scope.owner;
final JavaFileObject currentSource = log.currentSourceFile();
Log.DeferredDiagnosticHandler deferredDiagnosticHandler =
new Log.DeferredDiagnosticHandler(log, new Filter<JCDiagnostic>() {
public boolean accepts(JCDiagnostic t) {
return t.getDiagnosticSource().getFile().equals(currentSource);
public boolean accepts(final JCDiagnostic d) {
class PosScanner extends TreeScanner {
boolean found = false;
@Override
public void scan(JCTree tree) {
if (tree != null &&
tree.pos() == d.getDiagnosticPosition()) {
found = true;
}
super.scan(tree);
}
};
PosScanner posScanner = new PosScanner();
posScanner.scan(newTree);
return posScanner.found;
}
});
try {

4
langtools/src/share/classes/com/sun/tools/javac/util/JCDiagnostic.java
View File

@ -484,6 +484,10 @@ public class JCDiagnostic implements Diagnostic<JavaFileObject> {
return getIntEndPosition();
}
public DiagnosticPosition getDiagnosticPosition() {
return position;
}
/**
* Get the line number within the source referred to by this diagnostic.
* @return the line number within the source referred to by this diagnostic

17
langtools/test/tools/javac/lambda/speculative/MissingError.java Normal file
View File

@ -0,0 +1,17 @@
/*
* @test /nodynamiccopyright/
* @bug 8008276
* @summary assertion error in com.sun.tools.javac.comp.TransTypes.visitApply
* @compile/fail/ref=MissingError.out -XDrawDiagnostics MissingError.java
*/
class MissingError {
void test() {
mtest(new Bad(){ Integer i = ""; });
}
void mtest(Bad t){ }
}
class Bad {
String s = 1;
}

3
langtools/test/tools/javac/lambda/speculative/MissingError.out Normal file
View File

@ -0,0 +1,3 @@
MissingError.java:16:16: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
MissingError.java:9:37: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: java.lang.String, java.lang.Integer)
2 errors