# HG changeset patch
# User Tom Rodriguez <tom.rodriguez@oracle.com>
# Date 1492617656 25200
# Node ID 0e0a4ebf09d706b97cbe0b2b23fed65554a6c356
# Parent  0386b21ed2b3a74c02d725dce53c5d25c6cda49d
set_method_data_pointer_for_bcp must be guarded by ProfileInterpreter

diff -r 0386b21ed2b3 -r 0e0a4ebf09d7 src/cpu/x86/vm/templateInterpreter_x86_32.cpp
--- a/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Tue Apr 18 17:14:58 2017 +0200
+++ b/src/cpu/x86/vm/templateInterpreter_x86_32.cpp	Wed Apr 19 09:00:56 2017 -0700
@@ -443,7 +443,9 @@
   __ call_VM(noreg, CAST_FROM_FN_PTR(address, InterpreterRuntime::frequency_counter_overflow), rax);
 
   __ movptr(rbx, Address(rbp, method_offset));   // restore Method*
-  __ set_method_data_pointer_for_bcp();
+  if (ProfileInterpreter) {
+    __ set_method_data_pointer_for_bcp();
+  }
 
   // Preserve invariant that rsi/rdi contain bcp/locals of sender frame
   // and jump to the interpreted entry.
diff -r 0386b21ed2b3 -r 0e0a4ebf09d7 src/cpu/x86/vm/templateInterpreter_x86_64.cpp
--- a/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Tue Apr 18 17:14:58 2017 +0200
+++ b/src/cpu/x86/vm/templateInterpreter_x86_64.cpp	Wed Apr 19 09:00:56 2017 -0700
@@ -413,7 +413,9 @@
              c_rarg1);
 
   __ movptr(rbx, Address(rbp, method_offset));   // restore Method*
-  __ set_method_data_pointer_for_bcp();
+  if (ProfileInterpreter) {
+    __ set_method_data_pointer_for_bcp();
+  }
   // Preserve invariant that r13/r14 contain bcp/locals of sender frame
   // and jump to the interpreted entry.
   __ jmp(*do_continue, relocInfo::none);
diff -r 0386b21ed2b3 -r 0e0a4ebf09d7 src/cpu/x86/vm/templateTable_x86_32.cpp
--- a/src/cpu/x86/vm/templateTable_x86_32.cpp	Tue Apr 18 17:14:58 2017 +0200
+++ b/src/cpu/x86/vm/templateTable_x86_32.cpp	Wed Apr 19 09:00:56 2017 -0700
@@ -1770,7 +1770,9 @@
 
       // Load the MDO in case it was created by frequency_counter_overflow
       __ bind(maybe_load_mdp);
-      __ set_method_data_pointer_for_bcp();
+      if (ProfileInterpreter) {
+        __ set_method_data_pointer_for_bcp();
+      }
       __ jmp(dispatch);
     }
   }
diff -r 0386b21ed2b3 -r 0e0a4ebf09d7 src/cpu/x86/vm/templateTable_x86_64.cpp
--- a/src/cpu/x86/vm/templateTable_x86_64.cpp	Tue Apr 18 17:14:58 2017 +0200
+++ b/src/cpu/x86/vm/templateTable_x86_64.cpp	Wed Apr 19 09:00:56 2017 -0700
@@ -1803,7 +1803,9 @@
 
       // Load the MDO in case it was created by frequency_counter_overflow
       __ bind(maybe_load_mdp);
-      __ set_method_data_pointer_for_bcp();
+      if (ProfileInterpreter) {
+        __ set_method_data_pointer_for_bcp();
+      }
       __ jmp(dispatch);
     }
   }