*** old/src/share/vm/oops/instanceKlass.cpp	Wed Dec 17 11:50:53 2014
--- new/src/share/vm/oops/instanceKlass.cpp	Wed Dec 17 11:50:53 2014

*** 3541,3555 ****
--- 3541,3557 ----
              // RC_TRACE macro has an embedded ResourceMark
              RC_TRACE(0x00000200,
                ("purge: %s(%s): prev method @%d in version @%d is alive",
                method->name()->as_C_string(),
                method->signature()->as_C_string(), j, version));
+ #ifdef ASSERT
              if (method->method_data() != NULL) {
                // Clean out any weak method links for running methods
                // (also should include not EMCP methods)
!               method->method_data()->verify_clean_weak_method_links();
              }
+ #endif // ASSERT
            }
          }
        }
        // next previous version
        last = pv_node;

*** 3559,3577 ****
--- 3561,3581 ----
      RC_TRACE(0x00000200,
        ("purge: previous version stats: live=%d, deleted=%d", live_count,
        deleted_count));
    }
  
    // Clean MethodData of this class's methods so they don't refer to
+ #ifdef ASSERT
+   // Verify clean MethodData of this class's methods so they don't refer to
    // old methods that are no longer running.
    Array<Method*>* methods = ik->methods();
    int num_methods = methods->length();
    for (int index2 = 0; index2 < num_methods; ++index2) {
      if (methods->at(index2)->method_data() != NULL) {
!       methods->at(index2)->method_data()->verify_clean_weak_method_links();
      }
    }
+ #endif // ASSERT
  }
  
  void InstanceKlass::mark_newly_obsolete_methods(Array<Method*>* old_methods,
                                                  int emcp_method_count) {
    int obsolete_method_count = old_methods->length() - emcp_method_count;