Fixed bug in Remove Accesses where a WSubAccess's index was not checked for accesses.

Fixes #105

2 files changed, 6 insertions, 2 deletions

diff --git a/src/main/scala/firrtl/passes/Passes.scala b/src/main/scala/firrtl/passes/Passes.scala
index ef9380d3..777498d6 100644
--- a/src/main/scala/firrtl/passes/Passes.scala
+++ b/src/main/scala/firrtl/passes/Passes.scala
@@ -870,7 +870,11 @@ object RemoveAccesses extends Pass {
                   case (e:ValidIf) => e map (remove_e)
                   case (e:SIntValue) => e
                   case (e:UIntValue) => e
-                  case e => {
+                  case x => {
+                     val e = x match {
+                        case (w:WSubAccess) => WSubAccess(w.exp,remove_e(w.index),w.tpe,w.gender)
+                        case _ => x
+                     }
                      if (has_access(e)) {
                         val rs = get_locations(e)
                         val foo = rs.find(x => {x.guard != one})
diff --git a/src/test/scala/firrtlTests/FeatureSpec.scala b/src/test/scala/firrtlTests/FeatureSpec.scala
index 33cd473f..9545dedf 100644
--- a/src/test/scala/firrtlTests/FeatureSpec.scala
+++ b/src/test/scala/firrtlTests/FeatureSpec.scala
@@ -6,7 +6,7 @@ import org.scalatest._
 // Miscellaneous Feature Checks
 class FeatureSpec extends FirrtlPropSpec {
 
-  property("Nested SubAcceses should be supported!") {
+  property("Nested SubAccesses should be supported!") {
     runFirrtlTest("NestedSubAccessTester", "/features")
   }
 }