Mercurial > hg > graal-compiler
diff src/cpu/x86/vm/frame_x86.inline.hpp @ 11173:6b0fd0964b87
Merge with http://hg.openjdk.java.net/hsx/hsx25/hotspot/
| author | Doug Simon <doug.simon@oracle.com> |
|---|---|
| date | Wed, 31 Jul 2013 11:00:54 +0200 |
| parents | b9a918201d47 e619a2766bcc |
| children | d8041d695d19 |
line wrap: on
line diff
--- a/src/cpu/x86/vm/frame_x86.inline.hpp Tue Jul 30 13:03:28 2013 -0700 +++ b/src/cpu/x86/vm/frame_x86.inline.hpp Wed Jul 31 11:00:54 2013 +0200 @@ -272,11 +272,10 @@ // Entry frames -inline JavaCallWrapper* frame::entry_frame_call_wrapper() const { - return (JavaCallWrapper*)at(entry_frame_call_wrapper_offset); +inline JavaCallWrapper** frame::entry_frame_call_wrapper_addr() const { + return (JavaCallWrapper**)addr_at(entry_frame_call_wrapper_offset); } - // Compiled frames inline int frame::local_offset_for_compiler(int local_index, int nof_args, int max_nof_locals, int max_nof_monitors) {