--- a/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp Fri Sep 12 04:22:19 2014 -0700
+++ b/hotspot/src/cpu/ppc/vm/templateTable_ppc_64.cpp Mon Sep 15 08:08:22 2014 +0200
@@ -1674,9 +1674,9 @@
__ beq(CCR0, Lforward);
// Has the nmethod been invalidated already?
- __ lwz(R0, nmethod::entry_bci_offset(), R3_RET);
- __ cmpwi(CCR0, R0, InvalidOSREntryBci);
- __ beq(CCR0, Lforward);
+ __ lbz(R0, nmethod::state_offset(), R3_RET);
+ __ cmpwi(CCR0, R0, nmethod::in_use);
+ __ bne(CCR0, Lforward);
// Migrate the interpreter frame off of the stack.
// We can use all registers because we will not return to interpreter from this point.