# HG changeset patch # User Doug Simon # Date 1367624622 -7200 # Node ID 9e77e858b6eba64f3246c736ea335b42bc39a2a4 # Parent 54748fae40d7f59707788e5190d697bb5a19309d removed calls to VerifyOop stub from compiled stubs (stubs cannot call stubs) diff -r 54748fae40d7 -r 9e77e858b6eb graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Fri May 03 20:29:33 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Sat May 04 01:43:42 2013 +0200 @@ -101,7 +101,7 @@ if (memory.notEqual(0)) { log(log, "newArray: allocated new array at %p\n", memory); formatArray(hub, sizeInBytes, length, headerSize, memory, Word.unsigned(arrayPrototypeMarkWord()), true); - return verifyOop(memory.toObject()); + return memory.toObject(); } } log(log, "newArray: calling new_array_c\n", 0L); @@ -113,7 +113,7 @@ getAndClearObjectResult(thread()); DeoptimizeCallerNode.deopt(InvalidateReprofile, RuntimeConstraint); } - return verifyOop(getAndClearObjectResult(thread())); + return getAndClearObjectResult(thread()); } public static final Descriptor NEW_ARRAY_C = descriptorFor(NewArrayStub.class, "newArrayC", false); diff -r 54748fae40d7 -r 9e77e858b6eb graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java Fri May 03 20:29:33 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java Sat May 04 01:43:42 2013 +0200 @@ -94,7 +94,7 @@ for (int offset = 2 * wordSize(); offset < sizeInBytes; offset += wordSize()) { memory.writeWord(offset, Word.zero(), ANY_LOCATION); } - return verifyOop(memory.toObject()); + return memory.toObject(); } } } @@ -108,7 +108,7 @@ getAndClearObjectResult(thread()); DeoptimizeCallerNode.deopt(InvalidateReprofile, RuntimeConstraint); } - return verifyOop(getAndClearObjectResult(thread())); + return getAndClearObjectResult(thread()); } /** diff -r 54748fae40d7 -r 9e77e858b6eb graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewMultiArrayStub.java --- a/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewMultiArrayStub.java Fri May 03 20:29:33 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewMultiArrayStub.java Sat May 04 01:43:42 2013 +0200 @@ -48,7 +48,7 @@ private static Object newMultiArray(Word hub, int rank, Word dims) { newMultiArrayC(NEW_MULTI_ARRAY_C, thread(), hub, rank, dims); handlePendingException(true); - return verifyOop(getAndClearObjectResult(thread())); + return getAndClearObjectResult(thread()); } public static final Descriptor NEW_MULTI_ARRAY_C = descriptorFor(NewMultiArrayStub.class, "newMultiArrayC", false);