diff options
| author | Jim Lawson | 2016-11-10 10:05:15 -0800 |
|---|---|---|
| committer | Jim Lawson | 2016-11-10 10:05:15 -0800 |
| commit | 2e62da09ed1ed0725a14185ae76a683da73b32f4 (patch) | |
| tree | 29cc5966074ba9eb71c4a8bced5d8ff1f2601cae /chiselFrontend/src/main/scala/chisel3 | |
| parent | b2b80ce24881782b82b545e0e3cb2a0e4ef83557 (diff) | |
Throw exceptions for cloneType failures - fix #358
Add a Builder.exception() method for those cases where continuing is likely to mask the initial error.
Diffstat (limited to 'chiselFrontend/src/main/scala/chisel3')
| -rw-r--r-- | chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala | 4 | ||||
| -rw-r--r-- | chiselFrontend/src/main/scala/chisel3/internal/Builder.scala | 10 |
2 files changed, 12 insertions, 2 deletions
diff --git a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala index de7af462..68fe0bb5 100644 --- a/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala +++ b/chiselFrontend/src/main/scala/chisel3/core/Aggregate.scala @@ -408,12 +408,12 @@ class Bundle extends Aggregate { constructor.newInstance(_parent.get).asInstanceOf[this.type] } catch { case _: java.lang.reflect.InvocationTargetException | _: java.lang.IllegalArgumentException => - Builder.error(s"Parameterized Bundle ${this.getClass} needs cloneType method. You are probably using " + + Builder.exception(s"Parameterized Bundle ${this.getClass} needs cloneType method. You are probably using " + "an anonymous Bundle object that captures external state and hence is un-cloneTypeable") this } case _: java.lang.reflect.InvocationTargetException | _: java.lang.IllegalArgumentException => - Builder.error(s"Parameterized Bundle ${this.getClass} needs cloneType method") + Builder.exception(s"Parameterized Bundle ${this.getClass} needs cloneType method") this } } diff --git a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala index b4b0e028..32ba248c 100644 --- a/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala +++ b/chiselFrontend/src/main/scala/chisel3/internal/Builder.scala @@ -188,6 +188,16 @@ private[chisel3] object Builder { def warning(m: => String): Unit = errors.warning(m) def deprecated(m: => String): Unit = errors.deprecated(m) + /** Record an exception as an error, and throw it. + * + * @param m exception message + */ + @throws(classOf[ChiselException]) + def exception(m: => String): Unit = { + error(m) + throwException(m) + } + def build[T <: Module](f: => T): Circuit = { dynamicContextVar.withValue(Some(new DynamicContext())) { errors.info("Elaborating design...") |