diff src/share/vm/opto/compile.cpp @ 24094:9b69cec6d01b

Merge with jdk8u121-b13
author Gilles Duboscq <gilles.m.duboscq@oracle.com>
date Mon, 06 Feb 2017 17:18:57 +0100
parents f13e777eb255 371fd9bb8202
children
line wrap: on
line diff
--- a/src/share/vm/opto/compile.cpp	Sat Feb 04 15:24:10 2017 +0100
+++ b/src/share/vm/opto/compile.cpp	Mon Feb 06 17:18:57 2017 +0100
@@ -608,6 +608,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);