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

-:bfbedbfc522a
+:42b3c5e92461
 * Check bounds and perform incorporation
 */
 void checkWithinBounds(InferenceContext inferenceContext,
 Warner warn) throws InferenceException {
 MultiUndetVarListener mlistener = new MultiUndetVarListener(inferenceContext.undetvars);
+List<Type> saved_undet = inferenceContext.save();
 try {
 while (true) {
 mlistener.reset();
 if (!allowGraphInference) {
 //in legacy mode we lack of transitivity, so bound check
 if (!mlistener.changed || !allowGraphInference) break;
 }
 }
 finally {
 mlistener.detach();
+if (mlistener.rounds == MAX_INCORPORATION_STEPS) {
+inferenceContext.rollback(saved_undet);
+}
 }
 }
 //where
 /**
 * This listener keeps track of changes on a group of inference variable
 for (Type b : uv.getBounds(InferenceBound.UPPER)) {
 if (inferenceContext.inferenceVars().contains(b)) {
 UndetVar uv2 = (UndetVar)inferenceContext.asFree(b);
 //alpha <: beta
 //0. set beta :> alpha
-uv2.addBound(InferenceBound.LOWER, uv.qtype, infer.types);
+uv2.addBound(InferenceBound.LOWER, uv, infer.types);
 //1. copy alpha's lower to beta's
 for (Type l : uv.getBounds(InferenceBound.LOWER)) {
 uv2.addBound(InferenceBound.LOWER, inferenceContext.asInstType(l), infer.types);
 }
 //2. copy beta's upper to alpha's
 for (Type b : uv.getBounds(InferenceBound.LOWER)) {
 if (inferenceContext.inferenceVars().contains(b)) {
 UndetVar uv2 = (UndetVar)inferenceContext.asFree(b);
 //alpha :> beta
 //0. set beta <: alpha
-uv2.addBound(InferenceBound.UPPER, uv.qtype, infer.types);
+uv2.addBound(InferenceBound.UPPER, uv, infer.types);
 //1. copy alpha's upper to beta's
 for (Type u : uv.getBounds(InferenceBound.UPPER)) {
 uv2.addBound(InferenceBound.UPPER, inferenceContext.asInstType(u), infer.types);
 }
 //2. copy beta's lower to alpha's
 for (Type b : uv.getBounds(InferenceBound.EQ)) {
 if (inferenceContext.inferenceVars().contains(b)) {
 UndetVar uv2 = (UndetVar)inferenceContext.asFree(b);
 //alpha == beta
 //0. set beta == alpha
-uv2.addBound(InferenceBound.EQ, uv.qtype, infer.types);
+uv2.addBound(InferenceBound.EQ, uv, infer.types);
 //1. copy all alpha's bounds to beta's
 for (InferenceBound ib : InferenceBound.values()) {
 for (Type b2 : uv.getBounds(ib)) {
 if (b2 != uv2) {
 uv2.addBound(ib, inferenceContext.asInstType(b2), infer.types);
 checkWithinBounds(inferenceContext, warn); //initial propagation of bounds
 InferenceGraph inferenceGraph = new InferenceGraph();
 while (!sstrategy.done()) {
 InferenceGraph.Node nodeToSolve = sstrategy.pickNode(inferenceGraph);
 List<Type> varsToSolve = List.from(nodeToSolve.data);
-inferenceContext.save();
+List<Type> saved_undet = inferenceContext.save();
 try {
 //repeat until all variables are solved
 outer: while (Type.containsAny(inferenceContext.restvars(), varsToSolve)) {
 //for each inference phase
 for (GraphInferenceSteps step : GraphInferenceSteps.values()) {
 throw inferenceException.setMessage();
 }
 }
 catch (InferenceException ex) {
 //did we fail because of interdependent ivars?
-inferenceContext.rollback();
+inferenceContext.rollback(saved_undet);
 instantiateAsUninferredVars(varsToSolve, inferenceContext);
 checkWithinBounds(inferenceContext, warn);
 }
 inferenceGraph.deleteNode(nodeToSolve);
 }
 }
 /**
 * Save the state of this inference context
 */
-void save() {
+List<Type> save() {
 ListBuffer<Type> buf = ListBuffer.lb();
 for (Type t : undetvars) {
 UndetVar uv = (UndetVar)t;
 UndetVar uv2 = new UndetVar((TypeVar)uv.qtype, types);
 for (InferenceBound ib : InferenceBound.values()) {
 }
 }
 uv2.inst = uv.inst;
 buf.add(uv2);
 }
-saved_undet = buf.toList();
+return buf.toList();
 }
 /**
 * Restore the state of this inference context to the previous known checkpoint
 */
-void rollback() {
+void rollback(List<Type> saved_undet) {
 Assert.check(saved_undet != null && saved_undet.length() == undetvars.length());
-undetvars = saved_undet;
+//restore bounds (note: we need to preserve the old instances)
-saved_undet = null;
+for (Type t : undetvars) {
+UndetVar uv = (UndetVar)t;
+UndetVar uv_saved = (UndetVar)saved_undet.head;
+for (InferenceBound ib : InferenceBound.values()) {
+uv.setBounds(ib, uv_saved.getBounds(ib));
+}
+uv.inst = uv_saved.inst;
+saved_undet = saved_undet.tail;
+}
 }
 /**
 * Copy variable in this inference context to the given context
 */

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

comparison: src/share/classes/com/sun/tools/javac/comp/Infer.java

src/share/classes/com/sun/tools/javac/comp/Infer.java