- Added a block around each Return to make back...

- Added a block around each Return to make backend happy. Removed flag
- DEFERRED from bridge methods

1 files changed, 4 insertions, 2 deletions

diff --git a/sources/scalac/transformer/Erasure.java b/sources/scalac/transformer/Erasure.java
index a55d08d400..fbc75fc9cd 100644
--- a/sources/scalac/transformer/Erasure.java
+++ b/sources/scalac/transformer/Erasure.java
@@ -247,7 +247,7 @@ public class Erasure extends Transformer implements Modifiers {
 	}
 	Symbol bridgeSym = sym.cloneSymbol();
 	bridgeSym.flags |= (SYNTHETIC | BRIDGE);
-	bridgeSym.flags &= ~JAVA;
+	bridgeSym.flags &= ~(JAVA | DEFERRED);
 	bridgesOfSym = bridgesOfSym.incl(bridgeSym);
 	bridgeSyms.put(sym, bridgesOfSym);
         bridgeSym.setOwner(owner);
@@ -410,7 +410,9 @@ public class Erasure extends Transformer implements Modifiers {
 	case Return(Tree expr):
 	    Tree expr1 = transform(expr,
                                    tree.symbol().type().resultType().fullErasure());
-	    return copy.Return(tree, expr1).setType(owntype);
+            Tree zero = gen.Ident(tree.pos, definitions.NULL);
+	    return make.Block(tree.pos, new Tree[] {
+                copy.Return(tree, expr1).setType(owntype), zero}).setType(zero.type());
 
         case New(Template templ):
             if (tree.type.symbol() == definitions.UNIT_CLASS)