diff -r 6cc8e6f596b2 -r 29d8bb1668f5 hotspot/src/share/vm/c1/c1_Runtime1.cpp
--- a/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Wed Mar 02 15:42:03 2016 +0300
+++ b/hotspot/src/share/vm/c1/c1_Runtime1.cpp	Thu Mar 03 13:18:53 2016 +0100
@@ -1502,23 +1502,21 @@
   nm->make_not_entrant();
 
   methodHandle m(nm->method());
-  if (ProfileInterpreter) {
-    MethodData* mdo = m->method_data();
+  MethodData* mdo = m->method_data();
 
-    if (mdo == NULL && !HAS_PENDING_EXCEPTION) {
-      // Build an MDO.  Ignore errors like OutOfMemory;
-      // that simply means we won't have an MDO to update.
-      Method::build_interpreter_method_data(m, THREAD);
-      if (HAS_PENDING_EXCEPTION) {
-        assert((PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())), "we expect only an OOM error here");
-        CLEAR_PENDING_EXCEPTION;
-      }
-      mdo = m->method_data();
+  if (mdo == NULL && !HAS_PENDING_EXCEPTION) {
+    // Build an MDO.  Ignore errors like OutOfMemory;
+    // that simply means we won't have an MDO to update.
+    Method::build_interpreter_method_data(m, THREAD);
+    if (HAS_PENDING_EXCEPTION) {
+      assert((PENDING_EXCEPTION->is_a(SystemDictionary::OutOfMemoryError_klass())), "we expect only an OOM error here");
+      CLEAR_PENDING_EXCEPTION;
     }
+    mdo = m->method_data();
+  }
 
-    if (mdo != NULL) {
-      mdo->inc_trap_count(Deoptimization::Reason_none);
-    }
+  if (mdo != NULL) {
+    mdo->inc_trap_count(Deoptimization::Reason_none);
   }
 
   if (TracePredicateFailedTraps) {