diff -r 17294a77a970 -r 86ab3f0a9f87 hotspot/src/share/vm/oops/method.cpp
--- a/hotspot/src/share/vm/oops/method.cpp	Thu Apr 21 20:11:40 2016 +0000
+++ b/hotspot/src/share/vm/oops/method.cpp	Thu Apr 21 20:49:11 2016 -0700
@@ -1639,6 +1639,7 @@
   return true;
 }
 
+#if INCLUDE_JVMTI
 
 Bytecodes::Code Method::orig_bytecode_at(int bci) const {
   BreakpointInfo* bp = method_holder()->breakpoints();
@@ -1719,6 +1720,7 @@
   clear_matches(this, -1);
 }
 
+#endif // INCLUDE_JVMTI
 
 int Method::invocation_count() {
   MethodCounters *mcs = method_counters();
@@ -1784,6 +1786,8 @@
   }
 }
 
+#if INCLUDE_JVMTI
+
 BreakpointInfo::BreakpointInfo(Method* m, int bci) {
   _bci = bci;
   _name_index = m->name_index();
@@ -1821,6 +1825,8 @@
   method->decr_number_of_breakpoints(Thread::current());
 }
 
+#endif // INCLUDE_JVMTI
+
 // jmethodID handling
 
 // This is a block allocating object, sort of like JNIHandleBlock, only a