diff options
| -rw-r--r-- | chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala | 10 | ||||
| -rw-r--r-- | src/test/scala/chiselTests/BundleSpec.scala | 13 |
2 files changed, 20 insertions, 3 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala index 7a6b9b56..51b45828 100644 --- a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala +++ b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala @@ -12,6 +12,8 @@ import chisel3.internal.firrtl._ import chisel3.internal.sourceinfo._ import chisel3.SourceInfoDoc +class AliasedAggregateFieldException(message: String) extends ChiselException(message) + /** An abstract class for data types that solely consist of (are an aggregate * of) other Data objects. */ @@ -20,6 +22,10 @@ sealed abstract class Aggregate extends Data { binding = target val resolvedDirection = SpecifiedDirection.fromParent(parentDirection, specifiedDirection) + val duplicates = getElements.groupBy(identity).collect { case (x, elts) if elts.size > 1 => x } + if (!duplicates.isEmpty) { + throw new AliasedAggregateFieldException(s"Aggregate $this contains aliased fields $duplicates") + } for (child <- getElements) { child.bind(ChildBinding(this), resolvedDirection) } @@ -589,15 +595,13 @@ abstract class Bundle(implicit compileOptions: CompileOptions) extends Record { */ final lazy val elements: ListMap[String, Data] = { val nameMap = LinkedHashMap[String, Data]() - val seen = HashSet[Data]() for (m <- getPublicFields(classOf[Bundle])) { getBundleField(m) match { case Some(d: Data) => if (nameMap contains m.getName) { require(nameMap(m.getName) eq d) - } else if (!seen(d)) { + } else { nameMap(m.getName) = d - seen += d } case None => if (!ignoreSeq) { diff --git a/src/test/scala/chiselTests/BundleSpec.scala b/src/test/scala/chiselTests/BundleSpec.scala index 4fc7d7d0..d30b64b3 100644 --- a/src/test/scala/chiselTests/BundleSpec.scala +++ b/src/test/scala/chiselTests/BundleSpec.scala @@ -115,4 +115,17 @@ class BundleSpec extends ChiselFlatSpec with BundleSpecUtils { } } } + + "Bundles" should "not have aliased fields" in { + (the[ChiselException] thrownBy { + elaborate { new Module { + val io = IO(Output(new Bundle { + val a = UInt(8.W) + val b = a + })) + io.a := 0.U + io.b := 1.U + } } + }).getMessage should include("aliased fields") + } } |