Mercurial > hg > graal-compiler
changeset 674:4948e7dd28dc
6822333: _call_stub_compiled_return address handling in SA is broken causing jstack to hang occasionally
Reviewed-by: kvn, twisti
author | never |
---|---|
date | Fri, 27 Mar 2009 14:37:42 -0700 |
parents | fbc12e71c476 |
children | f6da6f0174ac |
files | agent/src/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java |
diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/agent/src/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java Thu Mar 26 15:04:55 2009 -0700 +++ b/agent/src/share/classes/sun/jvm/hotspot/runtime/StubRoutines.java Fri Mar 27 14:37:42 2009 -0700 @@ -46,12 +46,18 @@ Type type = db.lookupType("StubRoutines"); callStubReturnAddressField = type.getAddressField("_call_stub_return_address"); - // Only some platforms have specif return from compiled to call_stub + // Only some platforms have specific return from compiled to call_stub try { - callStubCompiledReturnAddressField = type.getAddressField("_call_stub_compiled_return"); + type = db.lookupType("StubRoutines::x86"); + if (type != null) { + callStubCompiledReturnAddressField = type.getAddressField("_call_stub_compiled_return"); + } } catch (RuntimeException re) { callStubCompiledReturnAddressField = null; } + if (callStubCompiledReturnAddressField == null && VM.getVM().getCPU().equals("x86")) { + throw new InternalError("Missing definition for _call_stub_compiled_return"); + } } public StubRoutines() {