fixed or removed incorrect assertions

ZhangTongLe · Jan 30, 2014 · 8706ec2 · 8706ec2
1 parent ed5dbb5
commit 8706ec2
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/...om.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java b/...om.oracle.graal.hotspot.amd64/src/com/oracle/graal/hotspot/amd64/AMD64HotSpotBackend.java
@@ -299,7 +299,11 @@ public void emitCodeSuffix(ResolvedJavaMethod installedCodeOwner, CompilationRes
         } else {
             // No need to emit the stubs for entries back into the method since
             // it has no calls that can cause such "return" entries
-            assert !frameMap.accessesCallerFrame() : lirGen.getGraph();
+
+            if (frameContext.omitFrame) {
+                // Cannot access slots in caller's frame if my frame is omitted
+                assert !frameMap.accessesCallerFrame() : lirGen.getGraph();
+            }
         }
     }
 }
diff --git a/...om.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java b/...om.oracle.graal.hotspot.sparc/src/com/oracle/graal/hotspot/sparc/SPARCHotSpotBackend.java
@@ -219,7 +219,6 @@ public void emitCode(CompilationResultBuilder crb, LIRGenerator lirGen, Resolved
         } else {
             // No need to emit the stubs for entries back into the method since
             // it has no calls that can cause such "return" entries
-            assert !frameMap.accessesCallerFrame() : lirGen.getGraph();
         }
 
         if (unverifiedStub != null) {