diff -r 38048d4d20e7 -r fd4bc78630b1 hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp
--- a/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp	Fri May 26 13:47:33 2017 -0700
+++ b/hotspot/src/share/vm/prims/jvmtiRedefineClasses.hpp	Sat May 27 09:21:01 2017 -0400
@@ -374,6 +374,11 @@
   InstanceKlass**             _scratch_classes;
   jvmtiError                  _res;
 
+  // Set if any of the InstanceKlasses have entries in the ResolvedMethodTable
+  // to avoid walking after redefinition if the redefined classes do not
+  // have any entries.
+  bool _any_class_has_resolved_methods;
+
   // Performance measurement support. These timers do not cover all
   // the work done for JVM/TI RedefineClasses() but they do cover
   // the heavy lifting.