jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/comp/Resolve.java

-:db36841709e4
+:1a65d6565b45
 package com.sun.tools.javac.comp;
 import com.sun.tools.javac.api.Formattable.LocalizedString;
 import com.sun.tools.javac.code.*;
+import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.code.Type.*;
-import com.sun.tools.javac.code.Symbol.*;
 import com.sun.tools.javac.comp.Attr.ResultInfo;
 import com.sun.tools.javac.comp.Check.CheckContext;
 import com.sun.tools.javac.comp.Infer.InferenceContext;
 import com.sun.tools.javac.comp.Infer.InferenceContext.FreeTypeListener;
 import com.sun.tools.javac.comp.Resolve.MethodResolutionContext.Candidate;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.EnumMap;
 import java.util.EnumSet;
 import java.util.HashSet;
+import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 import javax.lang.model.element.ElementVisitor;
 import static com.sun.tools.javac.code.Kinds.*;
 import static com.sun.tools.javac.code.Kinds.ERRONEOUS;
 import static com.sun.tools.javac.code.TypeTags.*;
 import static com.sun.tools.javac.comp.Resolve.MethodResolutionPhase.*;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
-import java.util.Iterator;
 /** Helper class for name resolution, used mostly by the attribution phase.
 *
 *  <p><b>This is NOT part of any supported API.
 *  If you write code that depends on this, you do so at your own risk.
 boolean abstractOk = true;
 List<Type> itypes = List.nil();
 for (TypeSymbol s : superclasses(intype)) {
 bestSoFar = lookupMethod(env, site, name, argtypes, typeargtypes,
 s.members(), bestSoFar, allowBoxing, useVarargs, operator, true);
-abstractOk &= excludeAbstractsFilter.accepts(s);
+//We should not look for abstract methods if receiver is a concrete class
+//(as concrete classes are expected to implement all abstracts coming
+//from superinterfaces)
+abstractOk &= (s.flags() & (ABSTRACT | INTERFACE | ENUM)) != 0;
 if (abstractOk) {
 for (Type itype : types.interfaces(s.type)) {
 itypes = types.union(types.closure(itype), itypes);
 }
 }
 return new Iterable<TypeSymbol>() {
 public Iterator<TypeSymbol> iterator() {
 return new Iterator<TypeSymbol>() {
 List<TypeSymbol> seen = List.nil();
-TypeSymbol currentSym = getSymbol(intype);
+TypeSymbol currentSym = symbolFor(intype);
+TypeSymbol prevSym = null;
 public boolean hasNext() {
+if (currentSym == syms.noSymbol) {
+currentSym = symbolFor(types.supertype(prevSym.type));
+}
 return currentSym != null;
 }
 public TypeSymbol next() {
-TypeSymbol prevSym = currentSym;
+prevSym = currentSym;
-currentSym = getSymbol(types.supertype(currentSym.type));
+currentSym = syms.noSymbol;
+Assert.check(prevSym != null || prevSym != syms.noSymbol);
 return prevSym;
 }
 public void remove() {
-throw new UnsupportedOperationException("Not supported yet.");
+throw new UnsupportedOperationException();
 }
-TypeSymbol getSymbol(Type intype) {
+TypeSymbol symbolFor(Type t) {
-if (intype.tag != CLASS &&
+if (t.tag != CLASS &&
-intype.tag != TYPEVAR) {
+t.tag != TYPEVAR) {
 return null;
 }
-while (intype.tag == TYPEVAR)
+while (t.tag == TYPEVAR)
-intype = intype.getUpperBound();
+t = t.getUpperBound();
-if (seen.contains(intype.tsym)) {
+if (seen.contains(t.tsym)) {
 //degenerate case in which we have a circular
 //class hierarchy - because of ill-formed classfiles
 return null;
 }
-seen = seen.prepend(intype.tsym);
+seen = seen.prepend(t.tsym);
-return intype.tsym;
+return t.tsym;
 }
 };
 }
 };
 }
-/**
-* We should not look for abstract methods if receiver is a concrete class
-* (as concrete classes are expected to implement all abstracts coming
-* from superinterfaces)
-*/
-Filter<Symbol> excludeAbstractsFilter = new Filter<Symbol>() {
-public boolean accepts(Symbol s) {
-return (s.flags() & (ABSTRACT | INTERFACE | ENUM)) != 0;
-}
-};
 /**
 * Lookup a method with given name and argument types in a given scope
 */
 Symbol lookupMethod(Env<AttrContext> env,

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

comparison: src/share/classes/com/sun/tools/javac/comp/Resolve.java

src/share/classes/com/sun/tools/javac/comp/Resolve.java