diff src/share/vm/runtime/frame.cpp @ 17813:af8cc1dae608

8035396: Introduce accessor for tmp_oop in frame. Summary: Avoid #ifs by introducing the accessor function interpreter_frame_temp_oop_addr(). Reviewed-by: kvn, twisti
author goetz
date Wed, 26 Feb 2014 11:33:34 -0800
parents a7d4d4655766
children 78bbf4d43a14
line wrap: on
line diff
--- a/src/share/vm/runtime/frame.cpp	Wed Mar 26 18:21:05 2014 -0700
+++ b/src/share/vm/runtime/frame.cpp	Wed Feb 26 11:33:34 2014 -0800
@@ -936,20 +936,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();