src/hotspot/share/oops/oop.cpp

@@ -33,66 +33,66 @@
 #include "runtime/thread.inline.hpp"
 #include "utilities/copy.hpp"
 
 bool always_do_update_barrier = false;
 
-void oopDesc::print_on(outputStream* st) const {
-  if (this == NULL) {
+void oopDesc::print_on(outputStream* st, oopDesc* oop_desc) {
+  if (oop_desc == NULL) {
     st->print_cr("NULL");
   } else {
-    klass()->oop_print_on(oop(this), st);
+    oop_desc->klass()->oop_print_on(oop(oop_desc), st);
   }
 }
 
 void oopDesc::print_address_on(outputStream* st) const {
   st->print("{" INTPTR_FORMAT "}", p2i(this));
 
 }
 
-void oopDesc::print()         { print_on(tty);         }
+void oopDesc::print()         { print_on(tty, this);         }
 
 void oopDesc::print_address() { print_address_on(tty); }
 
 char* oopDesc::print_string() {
   stringStream st;
-  print_on(&st);
+  print_on(&st, this);
   return st.as_string();
 }
 
 void oopDesc::print_value() {
-  print_value_on(tty);
+  print_value_on(tty, this);
 }
 
 char* oopDesc::print_value_string() {
   char buf[100];
   stringStream st(buf, sizeof(buf));
-  print_value_on(&st);
+  print_value_on(&st, this);
   return st.as_string();
 }
 
-void oopDesc::print_value_on(outputStream* st) const {
-  oop obj = oop(this);
-  if (this == NULL) {
+void oopDesc::print_value_on(outputStream* st, oopDesc* oop_desc) {
+  oop obj = oop(oop_desc);
+  if (oop_desc == NULL) {
     st->print("NULL");
   } else if (java_lang_String::is_instance(obj)) {
     java_lang_String::print(obj, st);
-    print_address_on(st);
+    oop_desc->print_address_on(st);
   } else {
-    klass()->oop_print_value_on(obj, st);
+    oop_desc->klass()->oop_print_value_on(obj, st);
   }
 }
 
 
-void oopDesc::verify_on(outputStream* st) {
-  if (this != NULL) {
-    klass()->oop_verify_on(this, st);
+void oopDesc::verify_on(outputStream* st, oopDesc* oop_desc) {
+  if (oop_desc != NULL) {
+    oop_desc->klass()->oop_verify_on(oop_desc, st);
   }
 }
 
 
 void oopDesc::verify() {
-  verify_on(tty);
+  verify_on(tty, this);
 }
 
 intptr_t oopDesc::slow_identity_hash() {
   // slow case; we have to acquire the micro lock in order to locate the header
   Thread* THREAD = Thread::current();