From ebef7f597b7e127652403d46b96f8d16360738fd Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Tue, 11 Feb 2020 12:29:36 -0800 Subject: Clone child elements lazily in Vec (#1329) Co-authored-by: Schuyler Eldridge --- chiselFrontend/src/main/scala/chisel3/Aggregate.scala | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'chiselFrontend/src') diff --git a/chiselFrontend/src/main/scala/chisel3/Aggregate.scala b/chiselFrontend/src/main/scala/chisel3/Aggregate.scala index 84e959a5..6c1e8dfb 100644 --- a/chiselFrontend/src/main/scala/chisel3/Aggregate.scala +++ b/chiselFrontend/src/main/scala/chisel3/Aggregate.scala @@ -165,9 +165,12 @@ sealed class Vec[T <: Data] private[chisel3] (gen: => T, val length: Int) // Note: the constructor takes a gen() function instead of a Seq to enforce // that all elements must be the same and because it makes FIRRTL generation // simpler. - private val self: Seq[T] = Vector.fill(length)(gen) - for ((elt, i) <- self.zipWithIndex) - elt.setRef(this, i) + private lazy val self: Seq[T] = { + val _self = Vector.fill(length)(gen) + for ((elt, i) <- _self.zipWithIndex) + elt.setRef(this, i) + _self + } /** * sample_element 'tracks' all changes to the elements. -- cgit v1.2.3