--- a/hotspot/src/share/vm/code/nmethod.cpp	Mon Nov 09 11:50:15 2015 -0500
+++ b/hotspot/src/share/vm/code/nmethod.cpp	Tue Oct 27 12:25:08 2015 +0100
@@ -2315,7 +2315,7 @@
     assert(cur != NULL, "not NULL-terminated");
     nmethod* next = cur->_oops_do_mark_link;
     cur->_oops_do_mark_link = NULL;
-    cur->verify_oop_relocations();
+    DEBUG_ONLY(cur->verify_oop_relocations());
     NOT_PRODUCT(if (TraceScavenge)  cur->print_on(tty, "oops_do, unmark"));
     cur = next;
   }