From b3bb45e1db2dd6ae24110a88fe42d326d13c5294 Mon Sep 17 00:00:00 2001
From: twisti <none@none>
Date: Mon, 18 Jun 2012 15:17:30 -0700
Subject: 7157365: jruby/bench.bench_timeout crashes with JVM internal error
 Reviewed-by: jrose, kvn

---
 src/share/vm/opto/chaitin.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/share/vm/opto/chaitin.cpp')

diff --git a/src/share/vm/opto/chaitin.cpp b/src/share/vm/opto/chaitin.cpp
index 0ed9b9627..00cabcf23 100644
--- a/src/share/vm/opto/chaitin.cpp
+++ b/src/share/vm/opto/chaitin.cpp
@@ -1536,7 +1536,7 @@ Node *PhaseChaitin::find_base_for_derived( Node **derived_base_map, Node *derive
 
   // Check for AddP-related opcodes
   if( !derived->is_Phi() ) {
-    assert( derived->as_Mach()->ideal_Opcode() == Op_AddP, "" );
+    assert(derived->as_Mach()->ideal_Opcode() == Op_AddP, err_msg("but is: %s", derived->Name()));
     Node *base = derived->in(AddPNode::Base);
     derived_base_map[derived->_idx] = base;
     return base;
-- 
cgit v1.2.3