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

     1.1 --- a/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Mon Jan 10 14:57:59 2011 -0800
     1.2 +++ b/src/share/classes/com/sun/tools/javac/jvm/ClassReader.java	Mon Jan 10 15:08:31 2011 -0800
     1.3 @@ -242,9 +242,9 @@
     1.4          if (classes != null) return;
     1.5  
     1.6          if (definitive) {
     1.7 -            assert packages == null || packages == syms.packages;
     1.8 +            Assert.check(packages == null || packages == syms.packages);
     1.9              packages = syms.packages;
    1.10 -            assert classes == null || classes == syms.classes;
    1.11 +            Assert.check(classes == null || classes == syms.classes);
    1.12              classes = syms.classes;
    1.13          } else {
    1.14              packages = new HashMap<Name, PackageSymbol>();
    1.15 @@ -530,7 +530,7 @@
    1.16          int index =  poolIdx[i];
    1.17          int len = getChar(index + 1);
    1.18          int start = index + 3;
    1.19 -        assert buf[start] == '[' || buf[start + len - 1] != ';';
    1.20 +        Assert.check(buf[start] == '[' || buf[start + len - 1] != ';');
    1.21          // by the above assertion, the following test can be
    1.22          // simplified to (buf[start] == '[')
    1.23          return (buf[start] == '[' || buf[start + len - 1] == ';')
    1.24 @@ -1041,7 +1041,7 @@
    1.25                          readingClassAttr = true;
    1.26                          try {
    1.27                              ClassType ct1 = (ClassType)c.type;
    1.28 -                            assert c == currentOwner;
    1.29 +                            Assert.check(c == currentOwner);
    1.30                              ct1.typarams_field = readTypeParams(nextChar());
    1.31                              ct1.supertype_field = sigToType();
    1.32                              ListBuffer<Type> is = new ListBuffer<Type>();
    1.33 @@ -1908,9 +1908,9 @@
    1.34          if (ct.interfaces_field == null)
    1.35              ct.interfaces_field = is.reverse();
    1.36  
    1.37 -        if (fieldCount != nextChar()) assert false;
    1.38 +        Assert.check(fieldCount == nextChar());
    1.39          for (int i = 0; i < fieldCount; i++) enterMember(c, readField());
    1.40 -        if (methodCount != nextChar()) assert false;
    1.41 +        Assert.check(methodCount == nextChar());
    1.42          for (int i = 0; i < methodCount; i++) enterMember(c, readMethod());
    1.43  
    1.44          typevars = typevars.leave();
    1.45 @@ -2019,7 +2019,7 @@
    1.46      public ClassSymbol defineClass(Name name, Symbol owner) {
    1.47          ClassSymbol c = new ClassSymbol(0, name, owner);
    1.48          if (owner.kind == PCK)
    1.49 -            assert classes.get(c.flatname) == null : c;
    1.50 +            Assert.checkNull(classes.get(c.flatname), c);
    1.51          c.completer = this;
    1.52          return c;
    1.53      }
    1.54 @@ -2159,9 +2159,9 @@
    1.55          if (classfile != null) {
    1.56              JavaFileObject previousClassFile = currentClassFile;
    1.57              try {
    1.58 -                assert !filling :
    1.59 -                    "Filling " + classfile.toUri() +
    1.60 -                    " during " + previousClassFile;
    1.61 +                if (filling) {
    1.62 +                    Assert.error("Filling " + classfile.toUri() + " during " + previousClassFile);
    1.63 +                }
    1.64                  currentClassFile = classfile;
    1.65                  if (verbose) {
    1.66                      printVerbose("loading", currentClassFile.toString());
    1.67 @@ -2307,7 +2307,7 @@
    1.68      public PackageSymbol enterPackage(Name fullname) {
    1.69          PackageSymbol p = packages.get(fullname);
    1.70          if (p == null) {
    1.71 -            assert !fullname.isEmpty() : "rootPackage missing!";
    1.72 +            Assert.check(!fullname.isEmpty(), "rootPackage missing!");
    1.73              p = new PackageSymbol(
    1.74                  Convert.shortName(fullname),
    1.75                  enterPackage(Convert.packagePart(fullname)));