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

equal deleted inserted replaced

-:d5fe2c1cecfc
+:e1aa25ccdabb
 /** Return flags as a string, separated by " ".
 */
 public static String flagNames(long flags) {
-StringBuffer sbuf = new StringBuffer();
+StringBuilder sbuf = new StringBuilder();
 int i = 0;
 long f = flags & StandardFlags;
 while (f != 0) {
-if ((f & 1) != 0) sbuf.append(" " + flagName[i]);
+if ((f & 1) != 0) {
+sbuf.append(" ");
+sbuf.append(flagName[i]);
+}
 f = f >> 1;
 i++;
 }
 return sbuf.toString();
 }
 c.name == names.empty; // or anonymous
 assembleClassSig(rawOuter
 ? types.erasure(outer)
 : outer);
 sigbuf.appendByte('.');
-assert c.flatname.startsWith(c.owner.enclClass().flatname);
+Assert.check(c.flatname.startsWith(c.owner.enclClass().flatname));
 sigbuf.appendName(rawOuter
 ? c.flatname.subName(c.owner.enclClass().flatname.getByteLength()+1,c.flatname.getByteLength())
 : c.name);
 } else {
 sigbuf.appendBytes(externalize(c.flatname));
 }
 /** Return signature of given type
 */
 Name typeSig(Type type) {
-assert sigbuf.length == 0;
+Assert.check(sigbuf.length == 0);
 //- System.out.println(" ? " + type);
 assembleSig(type);
 Name n = sigbuf.toName(names);
 sigbuf.reset();
 //- System.out.println("   " + n);
 int poolCountIdx = poolbuf.length;
 poolbuf.appendChar(0);
 int i = 1;
 while (i < pool.pp) {
 Object value = pool.pool[i];
-assert value != null;
+Assert.checkNonNull(value);
 if (value instanceof Pool.Method)
 value = ((Pool.Method)value).m;
 else if (value instanceof Pool.Variable)
 value = ((Pool.Variable)value).v;
 Type type = (Type)value;
 if (type.tag == CLASS) enterInner((ClassSymbol)type.tsym);
 poolbuf.appendByte(CONSTANT_Class);
 poolbuf.appendChar(pool.put(xClassName(type)));
 } else {
-assert false : "writePool " + value;
+Assert.error("writePool " + value);
 }
 i++;
 }
 if (pool.pp > Pool.MAX_ENTRIES)
 throw new PoolOverflow();
 break;
 case BOOLEAN:
 databuf.appendByte('Z');
 break;
 case CLASS:
-assert value instanceof String;
+Assert.check(value instanceof String);
 databuf.appendByte('s');
 value = names.fromString(value.toString()); // CONSTANT_Utf8
 break;
 default:
 throw new AssertionError(_value.type);
 for (int i=0; i<code.varBufferSize; i++) {
 Code.LocalVar var = code.varBuffer[i];
 // write variable info
-assert var.start_pc >= 0;
+Assert.check(var.start_pc >= 0
-assert var.start_pc <= code.cp;
+&& var.start_pc <= code.cp);
 databuf.appendChar(var.start_pc);
-assert var.length >= 0;
+Assert.check(var.length >= 0
-assert (var.start_pc + var.length) <= code.cp;
+&& (var.start_pc + var.length) <= code.cp);
 databuf.appendChar(var.length);
 VarSymbol sym = var.sym;
 databuf.appendChar(pool.put(sym.name));
 Type vartype = sym.erasure(types);
 if (needsLocalVariableTypeEntry(sym.type))
 databuf.appendChar(var.length);
 databuf.appendChar(pool.put(sym.name));
 databuf.appendChar(pool.put(typeSig(sym.type)));
 databuf.appendChar(var.reg);
 }
-assert count == nGenericVars;
+Assert.check(count == nGenericVars);
 endAttr(alenIdx);
 acount++;
 }
 if (code.stackMapBufferSize > 0) {
 }
 if (debugstackmap) System.out.println();
 }
 break;
 case JSR202: {
-assert code.stackMapBuffer == null;
+Assert.checkNull(code.stackMapBuffer);
 for (int i=0; i<nframes; i++) {
 if (debugstackmap) System.out.print("  " + i + ":");
 StackMapTableFrame frame = code.stackMapTableBuffer[i];
 frame.write(this);
 if (debugstackmap) System.out.println();
 /** Write class `c' to outstream `out'.
 */
 public void writeClassFile(OutputStream out, ClassSymbol c)
 throws IOException, PoolOverflow, StringOverflow {
-assert (c.flags() & COMPOUND) == 0;
+Assert.check((c.flags() & COMPOUND) == 0);
 databuf.reset();
 poolbuf.reset();
 sigbuf.reset();
 pool = c.pool;
 innerClasses = null;
 switch (e.sym.kind) {
 case VAR: fieldsCount++; break;
 case MTH: if ((e.sym.flags() & HYPOTHETICAL) == 0) methodsCount++;
 break;
 case TYP: enterInner((ClassSymbol)e.sym); break;
-default : assert false;
+default : Assert.error();
 }
 }
 databuf.appendChar(fieldsCount);
 writeFields(c.members().elems);
 databuf.appendChar(methodsCount);
 boolean sigReq =
 typarams.length() != 0 || supertype.allparams().length() != 0;
 for (List<Type> l = interfaces; !sigReq && l.nonEmpty(); l = l.tail)
 sigReq = l.head.allparams().length() != 0;
 if (sigReq) {
-assert source.allowGenerics();
+Assert.check(source.allowGenerics());
 int alenIdx = writeAttr(names.Signature);
 if (typarams.length() != 0) assembleParamsSig(typarams);
 assembleSig(supertype);
 for (List<Type> l = interfaces; l.nonEmpty(); l = l.tail)
 assembleSig(l.head);

changeset 8032	e1aa25ccdabb
parent 8031	d5fe2c1cecfc
child 8630	cd9eefe597f6