update jump.stackMap if jump != null

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@503 379699f6-c40d-0410-875b-85095c16579e

jode/jode/flow/IfThenElseBlock.java

@@ -1,20 +1,22 @@
-/* IfThenElseBlock (c) 1998 Jochen Hoenicke
+/* IfThenElseBlock Copyright (C) 1998-1999 Jochen Hoenicke.
  *
- * You may distribute under the terms of the GNU General Public License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2, or (at your option)
+ * any later version.
  *
- * IN NO EVENT SHALL JOCHEN HOENICKE BE LIABLE TO ANY PARTY FOR DIRECT,
+ * This program is distributed in the hope that it will be useful,
- * INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * THE USE OF THIS SOFTWARE AND ITS DOCUMENTATION, EVEN IF JOCHEN HOENICKE 
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * GNU General Public License for more details.
  *
- * JOCHEN HOENICKE SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT
+ * You should have received a copy of the GNU General Public License
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * along with this program; see the file COPYING.  If not, write to
- * PARTICULAR PURPOSE.  THE SOFTWARE PROVIDED HEREUNDER IS ON AN "AS IS"
+ * the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
- * BASIS, AND JOCHEN HOENICKE HAS NO OBLIGATION TO PROVIDE MAINTENANCE,
- * SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
  *
  * $Id$
  */
+
 package jode.flow;
 import jode.decompiler.LocalInfo;
 import jode.decompiler.TabbedPrintWriter;
@@ -110,11 +112,17 @@ public class IfThenElseBlock extends StructuredBlock {
 	} else
 	    newStack = stack;
 
-	return VariableStack.merge(thenBlock.mapStackToLocal(newStack),
+	VariableStack after 
-				   elseBlock == null ? newStack
+	    = VariableStack.merge(thenBlock.mapStackToLocal(newStack),
-				   : elseBlock.mapStackToLocal(newStack));
+				  elseBlock == null ? newStack
+				  : elseBlock.mapStackToLocal(newStack));
+	if (jump != null) {
+	    jump.stackMap = after;
+	    return null;
+	}
+	return after;
     }
-
+    
     public void removePush() {
 	if (condStack != null)
 	    cond = condStack.mergeIntoExpression(cond, used);