From 203616271a864ded538904721f19a975b2959569 Mon Sep 17 00:00:00 2001
From: jackkoenig
Date: Tue, 2 Aug 2016 09:05:01 -0700
Subject: Fix use of global state in instance loop checking

Also increase sensitivity of thread safety checking
Fixes #159
---
 src/main/scala/firrtl/passes/Checks.scala           | 2 +-
 src/test/scala/firrtlTests/MultiThreadingSpec.scala | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/main/scala/firrtl/passes/Checks.scala b/src/main/scala/firrtl/passes/Checks.scala
index 9bbf7fa8..ab6db202 100644
--- a/src/main/scala/firrtl/passes/Checks.scala
+++ b/src/main/scala/firrtl/passes/Checks.scala
@@ -256,7 +256,7 @@ object CheckHighForm extends Pass with LazyLogging {
             if (!c.modules.map(_.name).contains(s.module))
               errors.append(new ModuleNotDefinedException(s.module))
             // Check to see if a recursive module instantiation has occured
-            val childToParent = moduleGraph.add(mname, s.module)
+            val childToParent = moduleGraph.add(m.name, s.module)
             if(childToParent.nonEmpty) {
               errors.append(new InstanceLoop(childToParent.mkString("->")))
             }
diff --git a/src/test/scala/firrtlTests/MultiThreadingSpec.scala b/src/test/scala/firrtlTests/MultiThreadingSpec.scala
index c5ec95d1..bfaed330 100644
--- a/src/test/scala/firrtlTests/MultiThreadingSpec.scala
+++ b/src/test/scala/firrtlTests/MultiThreadingSpec.scala
@@ -22,7 +22,7 @@ class MultiThreadingSpec extends FirrtlPropSpec {
       new firrtl.LowFirrtlCompiler,
       new firrtl.VerilogCompiler)
     val inputFilePath = s"/integration/GCDTester.fir" // arbitrary
-    val numThreads = 8 // arbitrary
+    val numThreads = 64 // arbitrary
 
     // Begin the actual test
     val inputStream = getClass().getResourceAsStream(inputFilePath)
-- 
cgit v1.2.3