From acedc402f6e8c8389568c2279b682e494589cf26 Mon Sep 17 00:00:00 2001
From: kvn <unknown>
Date: Sun, 26 Jul 2009 12:59:41 -0700
Subject: [PATCH] 6851386: assert(b->find_node(def) < j,"uses must follow
 definitions") Summary: Add additional check for a tight loop. Reviewed-by:
 never

---
 src/share/vm/opto/block.cpp | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/share/vm/opto/block.cpp b/src/share/vm/opto/block.cpp
index 7af5c4f57..d29f8223e 100644
--- a/src/share/vm/opto/block.cpp
+++ b/src/share/vm/opto/block.cpp
@@ -910,7 +910,16 @@ void PhaseCFG::verify( ) const {
               !(b->head()->is_Loop() && n->is_Phi()) &&
               // See (+++) comment in reg_split.cpp
               !(n->jvms() != NULL && n->jvms()->is_monitor_use(k)) ) {
-            assert( b->find_node(def) < j, "uses must follow definitions" );
+            bool is_loop = false;
+            if (n->is_Phi()) {
+              for( uint l = 1; l < def->req(); l++ ) {
+                if (n == def->in(l)) {
+                  is_loop = true;
+                  break; // Some kind of loop
+                }
+              }
+            }
+            assert( is_loop || b->find_node(def) < j, "uses must follow definitions" );
           }
           if( def->is_SafePointScalarObject() ) {
             assert(_bbs[def->_idx] == b, "SafePointScalarObject Node should be at the same block as its SafePoint node");
-- 
GitLab