diff options
| author | Iulian Dragos <jaguarul@gmail.com> | 2009-03-30 13:23:05 +0000 |
|---|---|---|
| committer | Iulian Dragos <jaguarul@gmail.com> | 2009-03-30 13:23:05 +0000 |
| commit | 8ffa7ff6be9b00e444432312823591360c788227 (patch) | |
| tree | c6ce2f984f8c006e7898f8c15cffb381fd7f4152 /src/compiler | |
| parent | 651294e1402d7dadef5ec6ee73b4c2aa690d5fbb (diff) | |
| download | scala-8ffa7ff6be9b00e444432312823591360c788227.tar.gz scala-8ffa7ff6be9b00e444432312823591360c788227.tar.bz2 scala-8ffa7ff6be9b00e444432312823591360c788227.zip | |
Fixed finalizers containing branches, and retur...
Fixed finalizers containing branches, and returns inside try-finally.
See #1536.
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/scala/tools/nsc/backend/icode/GenICode.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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 |