Mercurial > hg > truffle

changeset 6516:174805dea3fc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge.
author Christian Haeubl <haeubl@ssw.jku.at>
date Fri, 05 Oct 2012 10:54:06 +0200
parents e722fa145b37 (current diff) 515bc212a53c (diff)
children 2dfab5607b3d
files
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Fri Oct 05 10:13:19 2012 +0200
+++ b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Fri Oct 05 10:54:06 2012 +0200
@@ -1717,7 +1717,7 @@
 
   int vep_offset = ((intptr_t)__ pc()) - start;
 
-#ifdef COMPILER1
+#ifdef COMPILER1 || GRAAL
   if (InlineObjectHash && method->intrinsic_id() == vmIntrinsics::_hashCode) {
     // Object.hashCode can pull the hashCode from the header word
     // instead of doing a full VM transition once it's been computed.