Mercurial > hg > truffle
changeset 9576:e799f8478b6d
re-enabled object verification for NewArrayStub and NewInstanceStub
author | Doug Simon <doug.simon@oracle.com> |
---|---|
date | Mon, 06 May 2013 14:53:28 +0200 |
parents | 50779b21024b |
children | ffd3d85e055f |
files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewArrayStub.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/stubs/NewInstanceStub.java |
diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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);
--- 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())); } /**