Mercurial > hg > graal-compiler
changeset 8692:4f553e24b3b5
Merge
author | vlivanov |
---|---|
date | Tue, 05 Mar 2013 08:17:18 -0800 |
parents | c40fbf634c90 (diff) 571076d3c79d (current diff) |
children | 872b3feace55 |
files | |
diffstat | 1 files changed, 6 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp Tue Mar 05 04:24:50 2013 -0800 +++ b/src/share/vm/runtime/frame.cpp Tue Mar 05 08:17:18 2013 -0800 @@ -1070,7 +1070,12 @@ // First consult the ADLC on where it puts parameter 0 for this signature. VMReg reg = SharedRuntime::name_for_receiver(); - oop r = *caller.oopmapreg_to_location(reg, reg_map); + oop* oop_adr = caller.oopmapreg_to_location(reg, reg_map); + if (oop_adr == NULL) { + guarantee(oop_adr != NULL, "bad register save location"); + return NULL; + } + oop r = *oop_adr; assert(Universe::heap()->is_in_or_null(r), err_msg("bad receiver: " INTPTR_FORMAT " (" INTX_FORMAT ")", (intptr_t) r, (intptr_t) r)); return r; }