--- a/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp	Fri Aug 31 16:39:35 2012 -0700
+++ b/hotspot/src/cpu/sparc/vm/frame_sparc.inline.hpp	Sat Sep 01 13:25:18 2012 -0400
@@ -138,7 +138,7 @@
   return round_to(BasicObjectLock::size(), WordsPerLong);
 }
 
-inline methodOop* frame::interpreter_frame_method_addr() const {
+inline Method** frame::interpreter_frame_method_addr() const {
   interpreterState istate = get_interpreterState();
   return &istate->_method;
 }
@@ -147,12 +147,12 @@
 // Constant pool cache
 
 // where LcpoolCache is saved:
-inline constantPoolCacheOop* frame::interpreter_frame_cpoolcache_addr() const {
+inline ConstantPoolCache** frame::interpreter_frame_cpoolcache_addr() const {
   interpreterState istate = get_interpreterState();
   return &istate->_constants; // should really use accessor
   }
 
-inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const {
+inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const {
   interpreterState istate = get_interpreterState();
   return &istate->_constants;
 }
@@ -213,20 +213,20 @@
   return round_to(BasicObjectLock::size(), WordsPerLong);
 }
 
-inline methodOop* frame::interpreter_frame_method_addr() const {
-  return (methodOop*)sp_addr_at( Lmethod->sp_offset_in_saved_window());
+inline Method** frame::interpreter_frame_method_addr() const {
+  return (Method**)sp_addr_at( Lmethod->sp_offset_in_saved_window());
 }
 
 
 // Constant pool cache
 
 // where LcpoolCache is saved:
-inline constantPoolCacheOop* frame::interpreter_frame_cpoolcache_addr() const {
-    return (constantPoolCacheOop*)sp_addr_at(LcpoolCache->sp_offset_in_saved_window());
+inline ConstantPoolCache** frame::interpreter_frame_cpoolcache_addr() const {
+    return (ConstantPoolCache**)sp_addr_at(LcpoolCache->sp_offset_in_saved_window());
   }
 
-inline constantPoolCacheOop* frame::interpreter_frame_cache_addr() const {
-  return (constantPoolCacheOop*)sp_addr_at( LcpoolCache->sp_offset_in_saved_window());
+inline ConstantPoolCache** frame::interpreter_frame_cache_addr() const {
+  return (ConstantPoolCache**)sp_addr_at( LcpoolCache->sp_offset_in_saved_window());
 }
 #endif // CC_INTERP