jdk-sandbox: comparison langtools/src/share/classes/com/sun/tools/javac/jvm/Gen.java

equal deleted inserted replaced

-:d5fe2c1cecfc
+:e1aa25ccdabb
 checkStringConstant(vdef.init.pos(), sym.getConstValue());
 }
 }
 break;
 default:
-assert false;
+Assert.error();
 }
 }
 // Insert any instance initializers into all constructors.
 if (initCode.length() != 0) {
 List<JCStatement> inits = initCode.toList();
 for (List<JCExpression> l = trees; l.nonEmpty(); l = l.tail) {
 genExpr(l.head, pts.head).load();
 pts = pts.tail;
 }
 // require lists be of same length
-assert pts.isEmpty();
+Assert.check(pts.isEmpty());
 }
 /* ************************************************************************
 * Visitor methods for statements and definitions
 *************************************************************************/
 code.resolve(localEnv.info.exit);
 }
 public void visitSwitch(JCSwitch tree) {
 int limit = code.nextreg;
-assert tree.selector.type.tag != CLASS;
+Assert.check(tree.selector.type.tag != 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> {}
 labels[i] = val;
 if (val < lo) lo = val;
 if (hi < val) hi = val;
 nlabels++;
 } else {
-assert defaultIndex == -1;
+Assert.check(defaultIndex == -1);
 defaultIndex = i;
 }
 l = l.tail;
 }
 // in a new environment with the "exit-monitor" operation as finalizer.
 final Env<GenContext> syncEnv = env.dup(tree, new GenContext());
 syncEnv.info.finalize = new GenFinalizer() {
 void gen() {
 genLast();
-assert syncEnv.info.gaps.length() % 2 == 0;
+Assert.check(syncEnv.info.gaps.length() % 2 == 0);
 syncEnv.info.gaps.append(code.curPc());
 }
 void genLast() {
 if (code.isAlive()) {
 lockVar.load();
 tryEnv.info.cont =
 new Chain(code.emitJump(jsr),
 tryEnv.info.cont,
 jsrState);
 }
-assert tryEnv.info.gaps.length() % 2 == 0;
+Assert.check(tryEnv.info.gaps.length() % 2 == 0);
 tryEnv.info.gaps.append(code.curPc());
 } else {
-assert tryEnv.info.gaps.length() % 2 == 0;
+Assert.check(tryEnv.info.gaps.length() % 2 == 0);
 tryEnv.info.gaps.append(code.curPc());
 genLast();
 }
 }
 void genLast() {
 genExpr(tree.expr, tree.expr.type).drop();
 }
 public void visitBreak(JCBreak tree) {
 Env<GenContext> targetEnv = unwind(tree.target, env);
-assert code.state.stacksize == 0;
+Assert.check(code.state.stacksize == 0);
 targetEnv.info.addExit(code.branch(goto_));
 endFinalizerGaps(env, targetEnv);
 }
 public void visitContinue(JCContinue tree) {
 Env<GenContext> targetEnv = unwind(tree.target, env);
-assert code.state.stacksize == 0;
+Assert.check(code.state.stacksize == 0);
 targetEnv.info.addCont(code.branch(goto_));
 endFinalizerGaps(env, targetEnv);
 }
 public void visitReturn(JCReturn tree) {
 }
 public void visitNewClass(JCNewClass tree) {
 // Enclosing instances or anonymous classes should have been eliminated
 // by now.
-assert tree.encl == null && tree.def == null;
+Assert.check(tree.encl == null && tree.def == null);
 code.emitop2(new_, makeRef(tree.pos(), tree.type));
 code.emitop0(dup);
 // Generate code for all arguments, where the expected types are
 result = od.load();
 code.emitop0(dup);
 genNullCheck(tree.pos());
 break;
 default:
-assert false;
+Assert.error();
 }
 }
 }
 /** Generate a null check from the object value at stack top. */
 t = syms.objectType;
 }
 items.makeMemberItem(getStringBufferAppend(tree, t), false).invoke();
 }
 Symbol getStringBufferAppend(JCTree tree, Type t) {
-assert t.constValue() == null;
+Assert.checkNull(t.constValue());
 Symbol method = stringBufferAppend.get(t);
 if (method == null) {
 method = rs.resolveInternalMethod(tree.pos(),
 attrEnv,
 stringBufferType,
 public void visitSelect(JCFieldAccess tree) {
 Symbol sym = tree.sym;
 if (tree.name == names._class) {
-assert target.hasClassLiterals();
+Assert.check(target.hasClassLiterals());
 code.emitop2(ldc2, makeRef(tree.pos(), tree.selected.type));
 result = items.makeStackItem(pt);
 return;
 }

changeset 8032	e1aa25ccdabb
parent 8031	d5fe2c1cecfc
child 8036	17b976649c61