Mercurial > hg > graal-compiler
changeset 13102:f9f4503a4ab5
Merge
| author | Christos Kotselidis <christos.kotselidis@oracle.com> |
|---|---|
| date | Thu, 21 Nov 2013 15:04:54 +0100 |
| parents | 790ebab62d23 (diff) df7fa4734c44 (current diff) |
| children | c0b0974dd509 ffa3d2d26cc2 |
| files | graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/bridge/MetricRateInPhase.java graal/com.oracle.graal.hotspot/src/com/oracle/graal/hotspot/meta/HotSpotHostLoweringProvider.java src/share/vm/code/nmethod.cpp src/share/vm/memory/metablock.cpp src/share/vm/memory/metablock.hpp test/compiler/8013496/Test8013496.sh test/compiler/intrinsics/mathexact/CondTest.java test/compiler/intrinsics/mathexact/ConstantTest.java test/compiler/intrinsics/mathexact/LoadTest.java test/compiler/intrinsics/mathexact/LoopDependentTest.java test/compiler/intrinsics/mathexact/NonConstantTest.java test/gc/7168848/HumongousAlloc.java |
| diffstat | 1 files changed, 1 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/code/nmethod.cpp Wed Nov 20 17:14:49 2013 -0800 +++ b/src/share/vm/code/nmethod.cpp Thu Nov 21 15:04:54 2013 +0100 @@ -1980,7 +1980,7 @@ // should not get GC'd. Skip the first few bytes of oops on // not-entrant methods. address low_boundary = verified_entry_point(); - if (is_not_entrant()) { + if (is_not_entrant() || is_zombie()) { low_boundary += NativeJump::instruction_size; // %%% Note: On SPARC we patch only a 4-byte trap, not a full NativeJump. // (See comment above.)