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

-:4a1c57a1c410
+:c002fdee76fd
 import com.sun.tools.javac.tree.EndPosTable;
 import com.sun.tools.javac.tree.JCTree.*;
 import static com.sun.tools.javac.code.Flags.*;
 import static com.sun.tools.javac.code.Kinds.*;
-import static com.sun.tools.javac.code.TypeTags.*;
+import static com.sun.tools.javac.code.TypeTag.*;
 import static com.sun.tools.javac.jvm.ByteCodes.*;
 import static com.sun.tools.javac.jvm.CRTFlags.*;
 import static com.sun.tools.javac.main.Option.*;
 import static com.sun.tools.javac.tree.JCTree.Tag.*;
 import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK;
 *  @param sym    The accessed symbol
 *  @param site   The qualifier's type.
 */
 Symbol binaryQualifier(Symbol sym, Type site) {
-if (site.tag == ARRAY) {
+if (site.hasTag(ARRAY)) {
 if (sym == syms.lengthVar ||
 sym.owner != syms.arrayClass)
 return sym;
 // array clone can be qualified by the array type in later targets
 Symbol qualifier = target.arrayBinaryCompatibility()
 *  return the reference's index.
 *  @param type   The type for which a reference is inserted.
 */
 int makeRef(DiagnosticPosition pos, Type type) {
 checkDimension(pos, type);
-return pool.put(type.tag == CLASS ? (Object)type.tsym : (Object)type);
+return pool.put(type.hasTag(CLASS) ? (Object)type.tsym : (Object)type);
 }
 /** Check if the given type is an array with too many dimensions.
 */
 private void checkDimension(DiagnosticPosition pos, Type t) {
-switch (t.tag) {
+switch (t.getTag()) {
 case METHOD:
 checkDimension(pos, t.getReturnType());
 for (List<Type> args = t.getParameterTypes(); args.nonEmpty(); args = args.tail)
 checkDimension(pos, args.head);
 break;
 // If last statement could complete normally, insert a
 // return at the end.
 if (code.isAlive()) {
 code.statBegin(TreeInfo.endPos(tree.body));
 if (env.enclMethod == null ||
-env.enclMethod.sym.type.getReturnType().tag == VOID) {
+env.enclMethod.sym.type.getReturnType().hasTag(VOID)) {
 code.emitop0(return_);
 } else {
 // sometime dead code seems alive (4415991);
 // generate a small loop instead
 int startpc = code.entryPoint();
 code.resolve(localEnv.info.exit);
 }
 public void visitSwitch(JCSwitch tree) {
 int limit = code.nextreg;
-Assert.check(tree.selector.type.tag != CLASS);
+Assert.check(!tree.selector.type.hasTag(CLASS));
 int startpcCrt = genCrt ? code.curPc() : 0;
 Item sel = genExpr(tree.selector, syms.intType);
 List<JCCase> cases = tree.cases;
 if (cases.isEmpty()) {
 // We are seeing:  switch <sel> {}
 // If we have an increment of -32768 to +32767 of a local
 // int variable we can use an incr instruction instead of
 // proceeding further.
 if ((tree.hasTag(PLUS_ASG) || tree.hasTag(MINUS_ASG)) &&
 l instanceof LocalItem &&
-tree.lhs.type.tag <= INT &&
+tree.lhs.type.getTag().isSubRangeOf(INT) &&
-tree.rhs.type.tag <= INT &&
+tree.rhs.type.getTag().isSubRangeOf(INT) &&
 tree.rhs.type.constValue() != null) {
 int ival = ((Number) tree.rhs.type.constValue()).intValue();
 if (tree.hasTag(MINUS_ASG)) ival = -ival;
 ((LocalItem)l).incr(ival);
 result = l;
 /** Append value (on tos) to string buffer (on tos - 1).
 */
 void appendString(JCTree tree) {
 Type t = tree.type.baseType();
-if (t.tag > lastBaseTag && t.tsym != syms.stringType.tsym) {
+if (!t.isPrimitive() && t.tsym != syms.stringType.tsym) {
 t = syms.objectType;
 }
 items.makeMemberItem(getStringBufferAppend(tree, t), false).invoke();
 }
 Symbol getStringBufferAppend(JCTree tree, Type t) {
 result = genExpr(tree.expr, tree.clazz.type).load();
 // Additional code is only needed if we cast to a reference type
 // which is not statically a supertype of the expression's type.
 // For basic types, the coerce(...) in genExpr(...) will do
 // the conversion.
-if (tree.clazz.type.tag > lastBaseTag &&
+if (!tree.clazz.type.isPrimitive() &&
 types.asSuper(tree.expr.type, tree.clazz.type.tsym) == null) {
 code.emitop2(checkcast, makeRef(tree.pos(), tree.clazz.type));
 }
 }
 public boolean isInvokeDynamic(Symbol sym) {
 return sym.kind == MTH && ((MethodSymbol)sym).isDynamic();
 }
 public void visitLiteral(JCLiteral tree) {
-if (tree.type.tag == TypeTags.BOT) {
+if (tree.type.hasTag(BOT)) {
 code.emitop0(aconst_null);
 if (types.dimensions(pt) > 1) {
 code.emitop2(checkcast, makeRef(tree.pos(), pt));
 result = items.makeStackItem(pt);
 } else {

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

comparison: src/share/classes/com/sun/tools/javac/jvm/Gen.java

src/share/classes/com/sun/tools/javac/jvm/Gen.java