1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Jan 10 14:57:59 2011 -0800
1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/Gen.java Mon Jan 10 15:08:31 2011 -0800
1.3 @@ -500,7 +500,7 @@
1.4 }
1.5 break;
1.6 default:
1.7 - assert false;
1.8 + Assert.error();
1.9 }
1.10 }
1.11 // Insert any instance initializers into all constructors.
1.12 @@ -857,7 +857,7 @@
1.13 pts = pts.tail;
1.14 }
1.15 // require lists be of same length
1.16 - assert pts.isEmpty();
1.17 + Assert.check(pts.isEmpty());
1.18 }
1.19
1.20 /* ************************************************************************
1.21 @@ -1111,7 +1111,7 @@
1.22
1.23 public void visitSwitch(JCSwitch tree) {
1.24 int limit = code.nextreg;
1.25 - assert tree.selector.type.tag != CLASS;
1.26 + Assert.check(tree.selector.type.tag != CLASS);
1.27 int startpcCrt = genCrt ? code.curPc() : 0;
1.28 Item sel = genExpr(tree.selector, syms.intType);
1.29 List<JCCase> cases = tree.cases;
1.30 @@ -1148,7 +1148,7 @@
1.31 if (hi < val) hi = val;
1.32 nlabels++;
1.33 } else {
1.34 - assert defaultIndex == -1;
1.35 + Assert.check(defaultIndex == -1);
1.36 defaultIndex = i;
1.37 }
1.38 l = l.tail;
1.39 @@ -1290,7 +1290,7 @@
1.40 syncEnv.info.finalize = new GenFinalizer() {
1.41 void gen() {
1.42 genLast();
1.43 - assert syncEnv.info.gaps.length() % 2 == 0;
1.44 + Assert.check(syncEnv.info.gaps.length() % 2 == 0);
1.45 syncEnv.info.gaps.append(code.curPc());
1.46 }
1.47 void genLast() {
1.48 @@ -1329,10 +1329,10 @@
1.49 tryEnv.info.cont,
1.50 jsrState);
1.51 }
1.52 - assert tryEnv.info.gaps.length() % 2 == 0;
1.53 + Assert.check(tryEnv.info.gaps.length() % 2 == 0);
1.54 tryEnv.info.gaps.append(code.curPc());
1.55 } else {
1.56 - assert tryEnv.info.gaps.length() % 2 == 0;
1.57 + Assert.check(tryEnv.info.gaps.length() % 2 == 0);
1.58 tryEnv.info.gaps.append(code.curPc());
1.59 genLast();
1.60 }
1.61 @@ -1640,14 +1640,14 @@
1.62
1.63 public void visitBreak(JCBreak tree) {
1.64 Env<GenContext> targetEnv = unwind(tree.target, env);
1.65 - assert code.state.stacksize == 0;
1.66 + Assert.check(code.state.stacksize == 0);
1.67 targetEnv.info.addExit(code.branch(goto_));
1.68 endFinalizerGaps(env, targetEnv);
1.69 }
1.70
1.71 public void visitContinue(JCContinue tree) {
1.72 Env<GenContext> targetEnv = unwind(tree.target, env);
1.73 - assert code.state.stacksize == 0;
1.74 + Assert.check(code.state.stacksize == 0);
1.75 targetEnv.info.addCont(code.branch(goto_));
1.76 endFinalizerGaps(env, targetEnv);
1.77 }
1.78 @@ -1720,7 +1720,7 @@
1.79 public void visitNewClass(JCNewClass tree) {
1.80 // Enclosing instances or anonymous classes should have been eliminated
1.81 // by now.
1.82 - assert tree.encl == null && tree.def == null;
1.83 + Assert.check(tree.encl == null && tree.def == null);
1.84
1.85 code.emitop2(new_, makeRef(tree.pos(), tree.type));
1.86 code.emitop0(dup);
1.87 @@ -1902,7 +1902,7 @@
1.88 genNullCheck(tree.pos());
1.89 break;
1.90 default:
1.91 - assert false;
1.92 + Assert.error();
1.93 }
1.94 }
1.95 }
1.96 @@ -1977,7 +1977,7 @@
1.97 items.makeMemberItem(getStringBufferAppend(tree, t), false).invoke();
1.98 }
1.99 Symbol getStringBufferAppend(JCTree tree, Type t) {
1.100 - assert t.constValue() == null;
1.101 + Assert.checkNull(t.constValue());
1.102 Symbol method = stringBufferAppend.get(t);
1.103 if (method == null) {
1.104 method = rs.resolveInternalMethod(tree.pos(),
1.105 @@ -2120,7 +2120,7 @@
1.106 Symbol sym = tree.sym;
1.107
1.108 if (tree.name == names._class) {
1.109 - assert target.hasClassLiterals();
1.110 + Assert.check(target.hasClassLiterals());
1.111 code.emitop2(ldc2, makeRef(tree.pos(), tree.selected.type));
1.112 result = items.makeStackItem(pt);
1.113 return;
