From 61810bc68020e087f9464c9eceb574ed2127e44b Mon Sep 17 00:00:00 2001 From: Jack Koenig Date: Tue, 10 Jul 2018 18:34:59 -0700 Subject: Fix use of read-only refs on rhs of connect in compatibility mode (#854) --- chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala | 4 ++-- chiselFrontend/src/main/scala/chisel3/core/Bits.scala | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'chiselFrontend') diff --git a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala index b1e86ea7..3dbce379 100644 --- a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala +++ b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala @@ -77,9 +77,9 @@ sealed abstract class Aggregate extends Data { // If the source is a DontCare, generate a DefInvalid for the sink, // otherwise, issue a Connect. if (that == DontCare) { - pushCommand(DefInvalid(sourceInfo, this.lref)) + pushCommand(DefInvalid(sourceInfo, Node(this))) } else { - pushCommand(BulkConnect(sourceInfo, this.lref, that.lref)) + pushCommand(BulkConnect(sourceInfo, Node(this), Node(that))) } } diff --git a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala index b67c3fe3..c3645700 100644 --- a/chiselFrontend/src/main/scala/chisel3/core/Bits.scala +++ b/chiselFrontend/src/main/scala/chisel3/core/Bits.scala @@ -36,9 +36,9 @@ abstract class Element(private[chisel3] val width: Width) extends Data { // If the source is a DontCare, generate a DefInvalid for the sink, // otherwise, issue a Connect. if (that == DontCare) { - pushCommand(DefInvalid(sourceInfo, this.lref)) + pushCommand(DefInvalid(sourceInfo, Node(this))) } else { - pushCommand(Connect(sourceInfo, this.lref, that.ref)) + pushCommand(Connect(sourceInfo, Node(this), that.ref)) } } } -- cgit v1.2.3