riscv/rocket-chip
1
0
Fork 0
Code Releases Activity

diplomacy: silence a warning (#560)

Browse Source
This commit is contained in:
Henry Cook 2017-02-22 11:28:04 -08:00 committed by GitHub
parent 45d016a76f
commit 027d6247b6
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/scala/diplomacy/LazyModule.scala
View File

@ -32,7 +32,7 @@ abstract class LazyModule()(implicit val p: Parameters)
} else if (classOf[Seq[LazyModule]].isAssignableFrom(m.getReturnType)) { } else if (classOf[Seq[LazyModule]].isAssignableFrom(m.getReturnType)) {
val obj = m.invoke(this) val obj = m.invoke(this)
if (obj eq null) Seq() else { if (obj eq null) Seq() else {
val seq = try { obj.asInstanceOf[Seq[Object]] } catch { case _ => null } val seq = try { obj.asInstanceOf[Seq[Object]] } catch { case _: Throwable => null }
if (seq eq null) Seq() else { if (seq eq null) Seq() else {
seq.zipWithIndex.map { case (l, i) => (m.getName + "_" + i, l) } seq.zipWithIndex.map { case (l, i) => (m.getName + "_" + i, l) }
} }