Mercurial > jdk8-mips64-public > langtools / file diff

     1.1 --- a/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Tue May 13 16:11:43 2014 +0100
     1.2 +++ b/src/share/classes/com/sun/tools/javac/comp/Resolve.java	Tue May 13 16:14:54 2014 +0100
     1.3 @@ -1432,7 +1432,7 @@
     1.4              return bestSoFar;
     1.5          } else if (useVarargs && (sym.flags() & VARARGS) == 0) {
     1.6              return bestSoFar.kind >= ERRONEOUS ?
     1.7 -                    new BadVarargsMethod((ResolveError)bestSoFar) :
     1.8 +                    new BadVarargsMethod((ResolveError)bestSoFar.baseSymbol()) :
     1.9                      bestSoFar;
    1.10          }
    1.11          Assert.check(sym.kind < AMBIGUOUS);
    1.12 @@ -2200,7 +2200,7 @@
    1.13                    List<Type> typeargtypes,
    1.14                    LogResolveHelper logResolveHelper) {
    1.15          if (sym.kind >= AMBIGUOUS) {
    1.16 -            ResolveError errSym = (ResolveError)sym;
    1.17 +            ResolveError errSym = (ResolveError)sym.baseSymbol();
    1.18              sym = errSym.access(name, qualified ? site.tsym : syms.noSymbol);
    1.19              argtypes = logResolveHelper.getArgumentTypes(errSym, sym, name, argtypes);
    1.20              if (logResolveHelper.resolveDiagnosticNeeded(site, argtypes, typeargtypes)) {
    1.21 @@ -2589,7 +2589,7 @@
    1.22                                  sym = super.access(env, pos, location, sym);
    1.23                              } else {
    1.24                                  final JCDiagnostic details = sym.kind == WRONG_MTH ?
    1.25 -                                                ((InapplicableSymbolError)sym).errCandidate().snd :
    1.26 +                                                ((InapplicableSymbolError)sym.baseSymbol()).errCandidate().snd :
    1.27                                                  null;
    1.28                                  sym = new InapplicableSymbolError(sym.kind, "diamondError", currentResolutionContext) {
    1.29                                      @Override
    1.30 @@ -2997,12 +2997,12 @@
    1.31                      return true;
    1.32                  case WRONG_MTH:
    1.33                      InapplicableSymbolError errSym =
    1.34 -                            (InapplicableSymbolError)s;
    1.35 +                            (InapplicableSymbolError)s.baseSymbol();
    1.36                      return new Template(MethodCheckDiag.ARITY_MISMATCH.regex())
    1.37                              .matches(errSym.errCandidate().snd);
    1.38                  case WRONG_MTHS:
    1.39                      InapplicableSymbolsError errSyms =
    1.40 -                            (InapplicableSymbolsError)s;
    1.41 +                            (InapplicableSymbolsError)s.baseSymbol();
    1.42                      return errSyms.filterCandidates(errSyms.mapCandidates()).isEmpty();
    1.43                  case WRONG_STATICNESS:
    1.44                      return false;