From 89234bcd42a88fa0cfd1fdad0a965c5b8da6e176 Mon Sep 17 00:00:00 2001
From: Wilson Snyder <wsnyder@wsnyder.org>
Date: Fri, 8 Jan 2010 10:46:12 -0500
Subject: [PATCH] V3Name: Fix O(n^2) recursion with deep modules

---
 src/V3Name.cpp | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/V3Name.cpp b/src/V3Name.cpp
index 3e1ecc48a..43b039c47 100644
--- a/src/V3Name.cpp
+++ b/src/V3Name.cpp
@@ -91,30 +91,34 @@ private:
 		       && !nodep->isTemp()));	// Don't bother to rename internal signals
     }
     virtual void visit(AstCFunc* nodep, AstNUser*) {
-	nodep->iterateChildren(*this);
-	rename(nodep, false);
+	if (!nodep->user1()) {
+	    nodep->iterateChildren(*this);
+	    rename(nodep, false);
+	}
     }
     virtual void visit(AstVarRef* nodep, AstNUser*) {
 	if (nodep->varp()) {
-	    nodep->varp()->iterateChildren(*this);
+	    nodep->varp()->iterate(*this);
 	    nodep->name(nodep->varp()->name());
 	}
     }
     virtual void visit(AstCell* nodep, AstNUser*) {
-	rename(nodep, !nodep->modp()->modPublic());
-	nodep->iterateChildren(*this);
+	if (!nodep->user1()) {
+	    rename(nodep, !nodep->modp()->modPublic());
+	    nodep->iterateChildren(*this);
+	}
     }
     virtual void visit(AstScope* nodep, AstNUser*) {
 	if (!nodep->user1()) {
-	    if (nodep->aboveScopep()) nodep->aboveScopep()->iterateChildren(*this);
-	    nodep->aboveCellp()->iterateChildren(*this);
+	    nodep->user1(1);
+	    if (nodep->aboveScopep()) nodep->aboveScopep()->iterate(*this);
+	    if (nodep->aboveCellp()) nodep->aboveCellp()->iterate(*this);
 	    // Always recompute name (as many level above scope may have changed)
 	    // Same formula as V3Scope
 	    nodep->name(nodep->isTop() ? "TOP"
 			: (nodep->aboveScopep()->name()+"."+nodep->aboveCellp()->name()));
-	    nodep->user1(1);
+	    nodep->iterateChildren(*this);
 	}
-	nodep->iterateChildren(*this);
     }
 
     //--------------------