From f26a47c4e8bda2f6c689b4e9b0bb5c64ccf4c699 Mon Sep 17 00:00:00 2001 From: Som Snytt Date: Tue, 21 Feb 2012 12:01:27 -0800 Subject: Disallow eliding when Nothing is expected --- src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 1 + 1 file changed, 1 insertion(+) (limited to 'src') diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index dd65e825c3..b9675b8270 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -885,6 +885,7 @@ abstract class GenICode extends SubComponent { ctx.bb.emit(CONSTANT(global.gen.mkConstantZero(expectedType.toType)), tree.pos) generatedType = expectedType } + else if (expectedType.isNothingType) unit.error(tree.pos, "Cannot elide where Nothing is required.") else { ctx.bb.emit(CONSTANT(Constant(null)), tree.pos) generatedType = NullReference -- cgit v1.2.3