--- old/src/share/vm/runtime/frame.cpp	2015-04-01 12:37:23.714364271 -0400
+++ new/src/share/vm/runtime/frame.cpp	2015-04-01 12:37:23.361687710 -0400
@@ -1104,9 +1104,9 @@
 // call f() on the interpreted Method*s in the stack.
 // Have to walk the entire code cache for the compiled frames Yuck.
 void frame::metadata_do(void f(Metadata*)) {
-  if (_cb != NULL && Interpreter::contains(pc())) {
+  if (is_interpreted_frame()) {
     Method* m = this->interpreter_frame_method();
-    assert(m != NULL, "huh?");
+    assert(m != NULL, "expecting a method in this frame");
     f(m);
   }
 }