Changed subclasses of javassist.expr.Expr so that $_ is always initialized.

git-svn-id: http://anonsvn.jboss.org/repos/javassist/trunk@109 30ef5769-5b8d-40dd-aea6-55b5d6557bb3

1 files changed, 6 insertions, 0 deletions

diff --git a/src/main/javassist/expr/MethodCall.java b/src/main/javassist/expr/MethodCall.java
index 28ed8d2d..1e0a842d 100644
--- a/src/main/javassist/expr/MethodCall.java
+++ b/src/main/javassist/expr/MethodCall.java
@@ -211,6 +211,12 @@ public class MethodCall extends Expr {
             Bytecode bytecode = jc.getBytecode();
             storeStack(params, c == INVOKESTATIC, paramVar, bytecode);
             jc.recordLocalVariables(ca, pos);
+
+            if (retType != CtClass.voidType) {
+                bytecode.addConstZero(retType);
+                bytecode.addStore(retVar, retType);     // initialize $_
+            }
+
             jc.compileStmnt(statement);
             if (retType != CtClass.voidType)
                 bytecode.addLoad(retVar, retType);