--- a/hotspot/src/share/vm/opto/parse1.cpp	Thu Jul 17 15:40:04 2014 -0700
+++ b/hotspot/src/share/vm/opto/parse1.cpp	Mon Jul 28 15:06:38 2014 -0700
@@ -575,12 +575,13 @@
       decrement_age();
     }
   }
-  if (depth() == 1) {
+
+  if (depth() == 1 && !failing()) {
     // Add check to deoptimize the nmethod if RTM state was changed
     rtm_deopt();
   }
 
-  // Check for bailouts during method entry.
+  // Check for bailouts during method entry or RTM state check setup.
   if (failing()) {
     if (log)  log->done("parse");
     C->set_default_node_notes(caller_nn);