From 8ffa7ff6be9b00e444432312823591360c788227 Mon Sep 17 00:00:00 2001 From: Iulian Dragos Date: Mon, 30 Mar 2009 13:23:05 +0000 Subject: Fixed finalizers containing branches, and retur... Fixed finalizers containing branches, and returns inside try-finally. See #1536. --- src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/compiler') diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala index 471a7cc6f7..3a4fa76891 100644 --- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala +++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala @@ -493,7 +493,7 @@ abstract class GenICode extends SubComponent { ctx1.cleanups = oldcleanups if (saved) ctx1.bb.emit(LOAD_LOCAL(tmp)) - adapt(returnedKind, ctx.method.returnType, ctx, tree.pos) + adapt(returnedKind, ctx1.method.returnType, ctx1, tree.pos) ctx1.bb.emit(RETURN(ctx.method.returnType), tree.pos) ctx1.bb.enterIgnoreMode generatedType = expectedType -- cgit v1.2.3