changeset 30106:ab720069962d

Merge
author coleenp
date Thu, 19 Mar 2015 23:33:38 +0000
parents b8c66d23f4df d9062ba42fd2
children e3d259b825a1
files
diffstat 2 files changed, 0 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/src/share/vm/oops/instanceKlass.cpp	Thu Mar 19 14:28:44 2015 -0700
+++ b/hotspot/src/share/vm/oops/instanceKlass.cpp	Thu Mar 19 23:33:38 2015 +0000
@@ -716,23 +716,6 @@
 
     // Set up method entry points for compiler and interpreter    .
     m->link_method(m, CHECK);
-
-    // This is for JVMTI and unrelated to relocator but the last thing we do
-#ifdef ASSERT
-    if (StressMethodComparator) {
-      ResourceMark rm(THREAD);
-      static int nmc = 0;
-      for (int j = i; j >= 0 && j >= i-4; j--) {
-        if ((++nmc % 1000) == 0)  tty->print_cr("Have run MethodComparator %d times...", nmc);
-        bool z = MethodComparator::methods_EMCP(m(),
-                   methods()->at(j));
-        if (j == i && !z) {
-          tty->print("MethodComparator FAIL: "); m->print(); m->print_codes();
-          assert(z, "method must compare equal to itself");
-        }
-      }
-    }
-#endif //ASSERT
   }
 }
 
--- a/hotspot/src/share/vm/runtime/globals.hpp	Thu Mar 19 14:28:44 2015 -0700
+++ b/hotspot/src/share/vm/runtime/globals.hpp	Thu Mar 19 23:33:38 2015 +0000
@@ -1342,9 +1342,6 @@
   product(intx, TraceRedefineClasses, 0,                                    \
           "Trace level for JVMTI RedefineClasses")                          \
                                                                             \
-  develop(bool, StressMethodComparator, false,                              \
-          "Run the MethodComparator on all loaded methods")                 \
-                                                                            \
   /* change to false by default sometime after Mustang */                   \
   product(bool, VerifyMergedCPBytecodes, true,                              \
           "Verify bytecodes after RedefineClasses constant pool merging")   \