--- a/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp Fri Dec 04 14:06:38 2015 +0100
+++ b/hotspot/src/cpu/ppc/vm/relocInfo_ppc.cpp Fri Dec 04 16:38:04 2015 +0100
@@ -84,13 +84,11 @@
NativeConditionalFarBranch* branch = NativeConditionalFarBranch_at(inst_loc);
return branch->branch_destination();
} else {
- // There are two instructions at the beginning of a stub, therefore we
- // load at orig_addr + 8.
orig_addr = nativeCall_at(inst_loc)->get_trampoline();
if (orig_addr == NULL) {
return (address) -1;
} else {
- return (address) nativeMovConstReg_at(orig_addr + 8)->data();
+ return ((NativeCallTrampolineStub*)orig_addr)->destination();
}
}
}