# HG changeset patch
# User Christian Haeubl <haeubl@ssw.jku.at>
# Date 1349427246 -7200
# Node ID 174805dea3fc9b1c7ca914f53d08fef1104f18b5
# Parent  e722fa145b37dcc9565906287c2dcd5777d44744# Parent  515bc212a53c0b61fa584fc8dbf3c663e8b54ef5
Merge.

diff -r e722fa145b37 -r 174805dea3fc src/cpu/x86/vm/sharedRuntime_x86_32.cpp
--- 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.