--- a/src/share/vm/ci/ciMethod.cpp	Thu Nov 17 00:52:17 2011 +0100
+++ b/src/share/vm/ci/ciMethod.cpp	Thu Nov 17 16:40:14 2011 +0100
@@ -97,11 +97,12 @@
   ciEnv *env = CURRENT_ENV;
   if (env->jvmti_can_hotswap_or_post_breakpoint() && can_be_compiled()) {
     // 6328518 check hotswap conditions under the right lock.
-    MutexLocker locker(Compile_lock);
-    if (Dependencies::check_evol_method(h_m()) != NULL) {
-      _is_c1_compilable = false;
-      _is_c2_compilable = false;
-    }
+    // TODO(tw): Check if we need that.
+    //MutexLocker locker(Compile_lock);
+    //if (Dependencies::check_evol_method(h_m()) != NULL) {
+    //  _is_c1_compilable = false;
+    //  _is_c2_compilable = false;
+    //}
   } else {
     CHECK_UNHANDLED_OOPS_ONLY(Thread::current()->clear_unhandled_oops());
   }