changeset 13518:622af5fb8c58

filter illegal toIntervals when verifying MoveResolver
author Tom Rodriguez <tom.rodriguez@oracle.com>
date Fri, 03 Jan 2014 16:38:57 -0800
parents eefb0224149d
children 1ceb90be7bac
files graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java
diffstat 1 files changed, 5 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java	Thu Jan 02 14:53:19 2014 -0800
+++ b/graal/com.oracle.graal.compiler/src/com/oracle/graal/compiler/alloc/MoveResolver.java	Fri Jan 03 16:38:57 2014 -0800
@@ -23,13 +23,11 @@
 package com.oracle.graal.compiler.alloc;
 
 import static com.oracle.graal.api.code.ValueUtil.*;
-
 import java.util.*;
 
 import com.oracle.graal.api.code.*;
 import com.oracle.graal.api.meta.*;
 import com.oracle.graal.debug.*;
-import com.oracle.graal.debug.internal.*;
 import com.oracle.graal.lir.*;
 
 /**
@@ -121,13 +119,12 @@
         usedRegs.clear();
         for (i = 0; i < mappingTo.size(); i++) {
             Interval interval = mappingTo.get(i);
+            if (isIllegal(interval.location())) {
+                // After insertion the location may become illegal, so don't check it since multiple
+                // intervals might be illegal.
+                continue;
+            }
             boolean unique = usedRegs.add(interval.location());
-            if (!unique) {
-                DebugScope.dump(this.allocator.ir, "exception");
-                DebugScope.dump(this.allocator.intervals, "exception");
-                DebugScope.dump(interval, "interval");
-                System.err.println(interval);
-            }
             assert unique : "cannot write to same register twice";
         }