8005964: Regression: difference in error recovery after ambiguity causes JCK test failure

Wed, 16 Jan 2013 17:40:28 +0000

author
mcimadamore
date
Wed, 16 Jan 2013 17:40:28 +0000
changeset 1498
1afdf1f1472b
parent 1497
7aa2025bbb7b
child 1499
6b6311a8c9cc

8005964: Regression: difference in error recovery after ambiguity causes JCK test failure
Summary: Wrong implementation of ResolveError.access in AmbiguityError
Reviewed-by: jjh

src/share/classes/com/sun/tools/javac/comp/Resolve.java file | annotate | diff | comparison | revisions
     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Jan 16 16:30:11 2013 +0000
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Wed Jan 16 17:40:28 2013 +0000
     1.3 @@ -3421,7 +3421,10 @@
     1.4  
     1.5          @Override
     1.6          protected Symbol access(Name name, TypeSymbol location) {
     1.7 -            return ambiguousSyms.last();
     1.8 +            Symbol firstAmbiguity = ambiguousSyms.last();
     1.9 +            return firstAmbiguity.kind == TYP ?
    1.10 +                    types.createErrorType(name, location, firstAmbiguity.type).tsym :
    1.11 +                    firstAmbiguity;
    1.12          }
    1.13      }
    1.14  

mercurial