jdk8-mips64-public/langtools: comparison src/share/classes/com/sun/tools/javac/code/Types.java

-:d17f37522154
+:7c537f4298fb
 /*
-* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.  Oracle designates this
 bLow  = rewriteQuantifiers(b, LOW,  REWRITE_TYPEVARS);
 lowSub = asSub(bLow, aLow.tsym);
 highSub = (lowSub == null) ? null : asSub(bHigh, aHigh.tsym);
 }
 if (highSub != null) {
-assert a.tsym == highSub.tsym && a.tsym == lowSub.tsym
+if (!(a.tsym == highSub.tsym && a.tsym == lowSub.tsym)) {
-: a.tsym + " != " + highSub.tsym + " != " + lowSub.tsym;
+Assert.error(a.tsym + " != " + highSub.tsym + " != " + lowSub.tsym);
+}
 if (!disjointTypes(aHigh.allparams(), highSub.allparams())
 && !disjointTypes(aHigh.allparams(), lowSub.allparams())
 && !disjointTypes(aLow.allparams(), highSub.allparams())
 && !disjointTypes(aLow.allparams(), lowSub.allparams())) {
 if (upcast ? giveWarning(a, b) :
 bt.interfaces_field = bounds;
 } else {
 bt.supertype_field = bounds.head;
 bt.interfaces_field = bounds.tail;
 }
-assert bt.supertype_field.tsym.completer != null
+Assert.check(bt.supertype_field.tsym.completer != null
-|| !bt.supertype_field.isInterface()
+|| !bt.supertype_field.isInterface(),
-: bt.supertype_field;
+bt.supertype_field);
 return bt;
 }
 /**
 * Same as {@link #makeCompoundType(List,Type)}, except that the
 // effect of calling
 // ClassSymbol.getInterfaces.  Since
 // t.interfaces_field is null after
 // completion, we can assume that t is not the
 // type of a class/interface declaration.
-assert t != t.tsym.type : t.toString();
+Assert.check(t != t.tsym.type, t);
 List<Type> actuals = t.allparams();
 List<Type> formals = t.tsym.type.allparams();
 if (t.hasErasedSupertypes()) {
 t.interfaces_field = erasureRecursive(interfaces);
 } else if (formals.nonEmpty()) {
 }
 act1 = act1.tail;
 act2 = act2.tail;
 typarams = typarams.tail;
 }
-assert(act1.isEmpty() && act2.isEmpty() && typarams.isEmpty());
+Assert.check(act1.isEmpty() && act2.isEmpty() && typarams.isEmpty());
 return new ClassType(class1.getEnclosingType(), merged.toList(), class1.tsym);
 }
 /**
 * Return the minimum type of a closure, a compound type if no
 case CLASS_BOUND:
 // calculate lub(A, B)
 while (ts.head.tag != CLASS && ts.head.tag != TYPEVAR)
 ts = ts.tail;
-assert !ts.isEmpty();
+Assert.check(!ts.isEmpty());
 List<Type> cl = closure(ts.head);
 for (Type t : ts.tail) {
 if (t.tag == CLASS || t.tag == TYPEVAR)
 cl = intersect(cl, closure(t));
 }
 // tries to reject a cast by transferring type parameters
 // from $to$ to $from$ by common superinterfaces.
 boolean reverse = false;
 Type target = to;
 if ((to.tsym.flags() & INTERFACE) == 0) {
-assert (from.tsym.flags() & INTERFACE) != 0;
+Assert.check((from.tsym.flags() & INTERFACE) != 0);
 reverse = true;
 to = from;
 from = target;
 }
 List<Type> commonSupers = superClosure(to, erasure(from));
 // tries to reject a cast by transferring type parameters
 // from the final class to the interface.
 boolean reverse = false;
 Type target = to;
 if ((to.tsym.flags() & INTERFACE) == 0) {
-assert (from.tsym.flags() & INTERFACE) != 0;
+Assert.check((from.tsym.flags() & INTERFACE) != 0);
 reverse = true;
 to = from;
 from = target;
 }
-assert (from.tsym.flags() & FINAL) != 0;
+Assert.check((from.tsym.flags() & FINAL) != 0);
 Type t1 = asSuper(from, to.tsym);
 if (t1 == null) return false;
 Type t2 = to;
 if (disjointTypes(t1.getTypeArguments(), t2.getTypeArguments()))
 return false;

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

comparison: src/share/classes/com/sun/tools/javac/code/Types.java

src/share/classes/com/sun/tools/javac/code/Types.java