summaryrefslogtreecommitdiff
path: root/libjava/interpret-run.cc
diff options
context:
space:
mode:
authorkgallowa <kgallowa@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-08 18:01:56 +0000
committerkgallowa <kgallowa@138bc75d-0d04-0410-961f-82ee72b054a4>2007-02-08 18:01:56 +0000
commit8bf41e44e7ffb124a1a7dee61a26bca4d627aae1 (patch)
tree62949050654147577945d70db07dfdbfacbe1feb /libjava/interpret-run.cc
parent199c981a9524ea890ecd043243571f67ad856501 (diff)
downloadgcc-8bf41e44e7ffb124a1a7dee61a26bca4d627aae1.tar.gz
2007-02-06 Kyle Galloway <kgallowa@redhat.com>
* include/java-interp.h (_Jv_InterpFrame): obj_ptr field added to hold "this" pointer for frame. (_Jv_InterpFrame::get_this_ptr): New method. * interpret-run.cc: Copy the "this" pointer into obj_ptr. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@121717 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libjava/interpret-run.cc')
-rw-r--r--libjava/interpret-run.cc9
1 files changed, 9 insertions, 0 deletions
diff --git a/libjava/interpret-run.cc b/libjava/interpret-run.cc
index 12d0b9a5683..8a4d204090f 100644
--- a/libjava/interpret-run.cc
+++ b/libjava/interpret-run.cc
@@ -349,6 +349,15 @@ details. */
*/
memcpy ((void*) locals, (void*) args, meth->args_raw_size);
+#ifdef DEBUG
+ // Get the object pointer for this method, after checking that it is
+ // non-static.
+ _Jv_Method *method = meth->get_method ();
+
+ if ((method->accflags & java::lang::reflect::Modifier::STATIC) == 0)
+ frame_desc.obj_ptr = locals[0].o;
+#endif
+
_Jv_word *pool_data = meth->defining_class->constants.data;
/* These three are temporaries for common code used by several