--- a/hotspot/src/share/vm/opto/compile.cpp	Tue Jul 28 19:20:42 2015 +0200
+++ b/hotspot/src/share/vm/opto/compile.cpp	Wed Jul 29 08:05:21 2015 +0200
@@ -594,6 +594,10 @@
     n->as_MachBranch()->label_set(&fakeL, 0);
   }
   n->emit(buf, this->regalloc());
+
+  // Emitting into the scratch buffer should not fail
+  assert (!failing(), err_msg_res("Must not have pending failure. Reason is: %s", failure_reason()));
+
   if (is_branch) // Restore label.
     n->as_MachBranch()->label_set(saveL, save_bnum);