# HG changeset patch # User Doug Simon # Date 1367844808 -7200 # Node ID e799f8478b6d72be5a62883965d94703d160747b # Parent 50779b21024b4480a750f695b6557be907fd3a6a re-enabled object verification for NewArrayStub and NewInstanceStub diff -r 50779b21024b -r e799f8478b6d 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 Mon May 06 14:53:17 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java Mon May 06 14:53:28 2013 +0200 @@ -108,7 +108,7 @@ printf("newArray: allocated new array at %p\n", memory.rawValue()); } formatArray(hub, sizeInBytes, length, headerSize, memory, Word.unsigned(arrayPrototypeMarkWord()), true); - return memory.toObject(); + return verifyObject(memory.toObject()); } } if (logging()) { @@ -124,7 +124,7 @@ getAndClearObjectResult(thread()); DeoptimizeCallerNode.deopt(InvalidateReprofile, RuntimeConstraint); } - return getAndClearObjectResult(thread()); + return verifyObject(getAndClearObjectResult(thread())); } public static final Descriptor NEW_ARRAY_C = descriptorFor(NewArrayStub.class, "newArrayC", false); diff -r 50779b21024b -r e799f8478b6d 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 Mon May 06 14:53:17 2013 +0200 +++ b/graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java Mon May 06 14:53:28 2013 +0200 @@ -98,7 +98,7 @@ for (int offset = 2 * wordSize(); offset < sizeInBytes; offset += wordSize()) { memory.writeWord(offset, Word.zero(), ANY_LOCATION); } - return memory.toObject(); + return verifyObject(memory.toObject()); } } } @@ -116,7 +116,7 @@ getAndClearObjectResult(thread()); DeoptimizeCallerNode.deopt(InvalidateReprofile, RuntimeConstraint); } - return getAndClearObjectResult(thread()); + return verifyObject(getAndClearObjectResult(thread())); } /**