summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIulian Dragos <jaguarul@gmail.com>2006-06-20 11:33:58 +0000
committerIulian Dragos <jaguarul@gmail.com>2006-06-20 11:33:58 +0000
commit82492924248408873a734a200ae2b4b1bc71ec75 (patch)
tree93cb01b7125a57939e2475875f4b4638182729f3 /src
parentddad4e40ef78fc18fb054ac26bc056ed46822224 (diff)
downloadscala-82492924248408873a734a200ae2b4b1bc71ec75.tar.gz
scala-82492924248408873a734a200ae2b4b1bc71ec75.tar.bz2
scala-82492924248408873a734a200ae2b4b1bc71ec75.zip
Fixed bug #632 and updated test file.
Diffstat (limited to 'src')
-rw-r--r--src/compiler/scala/tools/nsc/backend/icode/GenICode.scala12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
index 19dc40af97..84ae7f7cde 100644
--- a/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
+++ b/src/compiler/scala/tools/nsc/backend/icode/GenICode.scala
@@ -436,15 +436,15 @@ abstract class GenICode extends SubComponent {
case Typed(Ident(nme.WILDCARD), tpt) => Pair(tpt.tpe.symbol, {
ctx: Context =>
ctx.bb.emit(DROP(REFERENCE(tpt.tpe.symbol)));
- val ctx1 = genLoad(finalizer, ctx, UNIT);
- genLoad(body, ctx1, kind);
+ val ctx1 = genLoad(body, ctx, kind);
+ genLoad(finalizer, ctx1, UNIT);
})
case Ident(nme.WILDCARD) => Pair(definitions.ThrowableClass, {
ctx: Context =>
ctx.bb.emit(DROP(REFERENCE(definitions.ThrowableClass)));
- val ctx1 = genLoad(finalizer, ctx, UNIT);
- genLoad(body, ctx1, kind)
+ val ctx1 = genLoad(body, ctx, kind);
+ genLoad(finalizer, ctx1, UNIT);
})
case Bind(name, _) =>
@@ -454,8 +454,8 @@ abstract class GenICode extends SubComponent {
Pair(pat.symbol.tpe.symbol, {
ctx: Context =>
ctx.bb.emit(STORE_LOCAL(exception), pat.pos);
- val ctx1 = genLoad(finalizer, ctx, UNIT);
- genLoad(body, ctx1, kind)
+ val ctx1 = genLoad(body, ctx, kind);
+ genLoad(finalizer, ctx1, UNIT);
})
}