--- a/src/hotspot/share/opto/output.cpp	Fri Jul 13 11:21:55 2018 +0800
+++ b/src/hotspot/share/opto/output.cpp	Thu Jul 12 16:31:28 2018 +0200
@@ -1424,7 +1424,7 @@
 
       // See if this instruction has a delay slot
       if (valid_bundle_info(n) && node_bundling(n)->use_unconditional_delay()) {
-        assert(delay_slot != NULL, "expecting delay slot node");
+        guarantee(delay_slot != NULL, "expecting delay slot node");
 
         // Back up 1 instruction
         cb->set_insts_end(cb->insts_end() - Pipeline::instr_unit_size());