Mercurial > hg > truffle
diff src/share/vm/runtime/frame.cpp @ 14513:16c705d792be
Merge
author | morris |
---|---|
date | Fri, 28 Feb 2014 08:02:20 -0800 |
parents | f460c6926af7 78112be27ba0 |
children | d8041d695d19 |
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp Fri Feb 28 14:56:04 2014 +0100 +++ b/src/share/vm/runtime/frame.cpp Fri Feb 28 08:02:20 2014 -0800 @@ -933,20 +933,9 @@ cld_f->do_cld(m->method_holder()->class_loader_data()); } -#if !defined(PPC32) || defined(ZERO) - if (m->is_native()) { -#ifdef CC_INTERP - interpreterState istate = get_interpreterState(); - f->do_oop((oop*)&istate->_oop_temp); -#else - f->do_oop((oop*)( fp() + interpreter_frame_oop_temp_offset )); -#endif /* CC_INTERP */ + if (m->is_native() PPC32_ONLY(&& m->is_static())) { + f->do_oop(interpreter_frame_temp_oop_addr()); } -#else // PPC32 - if (m->is_native() && m->is_static()) { - f->do_oop(interpreter_frame_mirror_addr()); - } -#endif // PPC32 int max_locals = m->is_native() ? m->size_of_parameters() : m->max_locals();