diff src/share/vm/prims/jvmtiTagMap.cpp @ 14909:4ca6dc0799b6

Backout jdk9 merge
author Gilles Duboscq <duboscq@ssw.jku.at>
date Tue, 01 Apr 2014 13:57:07 +0200
parents dcca80b5e7e7
children 51c6ce89d4dd
line wrap: on
line diff
--- a/src/share/vm/prims/jvmtiTagMap.cpp	Tue Apr 01 14:09:03 2014 +0200
+++ b/src/share/vm/prims/jvmtiTagMap.cpp	Tue Apr 01 13:57:07 2014 +0200
@@ -2790,7 +2790,6 @@
   return true;
 }
 
-#ifdef ASSERT
 // verify that a static oop field is in range
 static inline bool verify_static_oop(InstanceKlass* ik,
                                      oop mirror, int offset) {
@@ -2805,7 +2804,6 @@
     return false;
   }
 }
-#endif // #ifdef ASSERT
 
 // a class references its super class, interfaces, class loader, ...
 // and finally its static fields
@@ -3081,23 +3079,6 @@
               }
             }
           }
-
-          StackValueCollection* exprs = jvf->expressions();
-          for (int index=0; index < exprs->size(); index++) {
-            if (exprs->at(index)->type() == T_OBJECT) {
-              oop o = exprs->obj_at(index)();
-              if (o == NULL) {
-                continue;
-              }
-
-              // stack reference
-              if (!CallbackInvoker::report_stack_ref_root(thread_tag, tid, depth, method,
-                                                   bci, locals->size() + index, o)) {
-                return false;
-              }
-            }
-          }
-
         } else {
           blk->set_context(thread_tag, tid, depth, method);
           if (is_top_frame) {