infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-02-26 02:00:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

8020286: Wrong diagnostic after compaction

Browse Source 
Compact diagnostic shows the least relevant method in the list

Reviewed-by: jjg
This commit is contained in:
Maurizio Cimadamore 2013-07-17 14:14:32 +01:00
parent eb4e8153b3
commit 732e49f6dc
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
langtools/src/share/classes/com/sun/tools/javac/comp/Resolve.java
View File

@ -2490,7 +2490,7 @@ public class Resolve {
Symbol access(Env<AttrContext> env, DiagnosticPosition pos, Symbol location, Symbol sym) {
if (sym.kind >= AMBIGUOUS) {
final JCDiagnostic details = sym.kind == WRONG_MTH ?
((InapplicableSymbolError)sym).errCandidate().details :
((InapplicableSymbolError)sym).errCandidate().snd :
null;
sym = new InapplicableSymbolError(sym.kind, "diamondError", currentResolutionContext) {
@Override
@ -3442,20 +3442,20 @@ public class Resolve {
key, name, first, second);
}
else {
Candidate c = errCandidate();
Pair<Symbol, JCDiagnostic> c = errCandidate();
if (compactMethodDiags) {
for (Map.Entry<Template, DiagnosticRewriter> _entry :
MethodResolutionDiagHelper.rewriters.entrySet()) {
if (_entry.getKey().matches(c.details)) {
if (_entry.getKey().matches(c.snd)) {
JCDiagnostic simpleDiag =
_entry.getValue().rewriteDiagnostic(diags, pos,
log.currentSource(), dkind, c.details);
log.currentSource(), dkind, c.snd);
simpleDiag.setFlag(DiagnosticFlag.COMPRESSED);
return simpleDiag;
}
}
}
Symbol ws = c.sym.asMemberOf(site, types);
Symbol ws = c.fst.asMemberOf(site, types);
return diags.create(dkind, log.currentSource(), pos,
"cant.apply.symbol",
kindName(ws),
@ -3464,7 +3464,7 @@ public class Resolve {
methodArguments(argtypes),
kindName(ws.owner),
ws.owner.type,
c.details);
c.snd);
}
}
@ -3473,14 +3473,14 @@ public class Resolve {
return types.createErrorType(name, location, syms.errSymbol.type).tsym;
}
private Candidate errCandidate() {
protected Pair<Symbol, JCDiagnostic> errCandidate() {
Candidate bestSoFar = null;
for (Candidate c : resolveContext.candidates) {
if (c.isApplicable()) continue;
bestSoFar = c;
}
Assert.checkNonNull(bestSoFar);
return bestSoFar;
return new Pair<Symbol, JCDiagnostic>(bestSoFar.sym, bestSoFar.details);
}
}
@ -3523,7 +3523,15 @@ public class Resolve {
methodArguments(argtypes));
return new JCDiagnostic.MultilineDiagnostic(err, candidateDetails(filteredCandidates, site));
} else if (filteredCandidates.size() == 1) {
JCDiagnostic d = new InapplicableSymbolError(resolveContext).getDiagnostic(dkind, pos,
Map.Entry<Symbol, JCDiagnostic> _e =
filteredCandidates.entrySet().iterator().next();
final Pair<Symbol, JCDiagnostic> p = new Pair<Symbol, JCDiagnostic>(_e.getKey(), _e.getValue());
JCDiagnostic d = new InapplicableSymbolError(resolveContext) {
@Override
protected Pair<Symbol, JCDiagnostic> errCandidate() {
return p;
}
}.getDiagnostic(dkind, pos,
location, site, name, argtypes, typeargtypes);
if (truncatedDiag) {
d.setFlag(DiagnosticFlag.COMPRESSED);

15
langtools/test/tools/javac/Diagnostics/compressed/T8020286.java Normal file
View File

@ -0,0 +1,15 @@
/**
* @test /nodynamiccopyright/
* @bug 8020286
* @summary Wrong diagnostic after compaction
* @compile/fail/ref=T8020286.out -XDrawDiagnostics -Xdiags:compact T8020286.java
*/
class T8020286 {
void m(String s) { }
void m(Integer i, String s) { }
void test() {
m(1, 1);
m(1);
}
}

4
langtools/test/tools/javac/Diagnostics/compressed/T8020286.out Normal file
View File

@ -0,0 +1,4 @@
T8020286.java:12:13: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
T8020286.java:13:10: compiler.err.prob.found.req: (compiler.misc.inconvertible.types: int, java.lang.String)
- compiler.note.compressed.diags
2 errors