diff options
Diffstat (limited to 'src')
-rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 4 | ||||
-rw-r--r-- | src/library/scala/runtime/Nothing$.scala | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index 736780a435..5a257571a8 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -1036,9 +1036,7 @@ abstract class GenICode extends SubComponent { ctx.bb.emit(CALL_PRIMITIVE(Conversion(from, to)), pos); } } else if (from == SCALA_ALL) { - ctx.bb.emit(DROP(from)) - ctx.bb.emit(getZeroOf(ctx.method.returnType)) - ctx.bb.emit(RETURN(ctx.method.returnType)) + ctx.bb.emit(THROW()) ctx.bb.enterIgnoreMode } else if (from == SCALA_ALLREF) { ctx.bb.emit(DROP(from)) diff --git a/src/library/scala/runtime/Nothing$.scala b/src/library/scala/runtime/Nothing$.scala index c101637ff7..0aabaf6da8 100644 --- a/src/library/scala/runtime/Nothing$.scala +++ b/src/library/scala/runtime/Nothing$.scala @@ -18,4 +18,4 @@ package scala.runtime * signatures, it is erased to this one. */ -sealed abstract class Nothing$ +sealed abstract class Nothing$ extends Throwable |