diff -r d17f37522154 -r 7c537f4298fb src/share/classes/com/sun/tools/javac/jvm/ClassReader.java --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Jan 10 14:57:59 2011 -0800 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java Mon Jan 10 15:08:31 2011 -0800 @@ -242,9 +242,9 @@ if (classes != null) return; if (definitive) { - assert packages == null || packages == syms.packages; + Assert.check(packages == null || packages == syms.packages); packages = syms.packages; - assert classes == null || classes == syms.classes; + Assert.check(classes == null || classes == syms.classes); classes = syms.classes; } else { packages = new HashMap(); @@ -530,7 +530,7 @@ int index = poolIdx[i]; int len = getChar(index + 1); int start = index + 3; - assert buf[start] == '[' || buf[start + len - 1] != ';'; + Assert.check(buf[start] == '[' || buf[start + len - 1] != ';'); // by the above assertion, the following test can be // simplified to (buf[start] == '[') return (buf[start] == '[' || buf[start + len - 1] == ';') @@ -1041,7 +1041,7 @@ readingClassAttr = true; try { ClassType ct1 = (ClassType)c.type; - assert c == currentOwner; + Assert.check(c == currentOwner); ct1.typarams_field = readTypeParams(nextChar()); ct1.supertype_field = sigToType(); ListBuffer is = new ListBuffer(); @@ -1908,9 +1908,9 @@ if (ct.interfaces_field == null) ct.interfaces_field = is.reverse(); - if (fieldCount != nextChar()) assert false; + Assert.check(fieldCount == nextChar()); for (int i = 0; i < fieldCount; i++) enterMember(c, readField()); - if (methodCount != nextChar()) assert false; + Assert.check(methodCount == nextChar()); for (int i = 0; i < methodCount; i++) enterMember(c, readMethod()); typevars = typevars.leave(); @@ -2019,7 +2019,7 @@ public ClassSymbol defineClass(Name name, Symbol owner) { ClassSymbol c = new ClassSymbol(0, name, owner); if (owner.kind == PCK) - assert classes.get(c.flatname) == null : c; + Assert.checkNull(classes.get(c.flatname), c); c.completer = this; return c; } @@ -2159,9 +2159,9 @@ if (classfile != null) { JavaFileObject previousClassFile = currentClassFile; try { - assert !filling : - "Filling " + classfile.toUri() + - " during " + previousClassFile; + if (filling) { + Assert.error("Filling " + classfile.toUri() + " during " + previousClassFile); + } currentClassFile = classfile; if (verbose) { printVerbose("loading", currentClassFile.toString()); @@ -2307,7 +2307,7 @@ public PackageSymbol enterPackage(Name fullname) { PackageSymbol p = packages.get(fullname); if (p == null) { - assert !fullname.isEmpty() : "rootPackage missing!"; + Assert.check(!fullname.isEmpty(), "rootPackage missing!"); p = new PackageSymbol( Convert.shortName(fullname), enterPackage(Convert.packagePart(fullname)));