# HG changeset patch
# User Lukas Stadler <lukas.stadler@jku.at>
# Date 1349424682 -7200
# Node ID 515bc212a53c0b61fa584fc8dbf3c663e8b54ef5
# Parent  e4ae9932c29242eb9fa1c610f230ad77b9e400c4# Parent  edea9ba7ac7b2f690353d6a393ca8fabfc3fd79c
Merge.

diff -r edea9ba7ac7b -r 515bc212a53c src/cpu/x86/vm/sharedRuntime_x86_32.cpp
--- a/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Fri Oct 05 09:48:01 2012 +0200
+++ b/src/cpu/x86/vm/sharedRuntime_x86_32.cpp	Fri Oct 05 10:11:22 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.