From a147a6dbe321dcfc1519f4aa505ce4edb12eb50f Mon Sep 17 00:00:00 2001
From: jochen <jochen@379699f6-c40d-0410-875b-85095c16579e>
Date: Wed, 14 Apr 1999 20:22:13 +0000
Subject: [PATCH] Types moved to jode.type bug fix

git-svn-id: https://svn.code.sf.net/p/jode/code/trunk@602 379699f6-c40d-0410-875b-85095c16579e
---
 jode/jode/obfuscator/ConstantAnalyzer.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/jode/jode/obfuscator/ConstantAnalyzer.java b/jode/jode/obfuscator/ConstantAnalyzer.java
index 01ed22d..1948e00 100644
--- a/jode/jode/obfuscator/ConstantAnalyzer.java
+++ b/jode/jode/obfuscator/ConstantAnalyzer.java
@@ -18,9 +18,9 @@
  */
 
 package jode.obfuscator;
-import jode.MethodType;
+import jode.type.MethodType;
 import jode.Obfuscator;
-import jode.Type;
+import jode.type.Type;
 import jode.bytecode.*;
 import jode.jvm.InterpreterException;
 import java.util.*;
@@ -401,7 +401,7 @@ public class ConstantAnalyzer implements Opcodes, CodeAnalyzer {
         case opc_bastore: case opc_castore: case opc_sastore: {
 	    int size = (opcode == opc_lastore
 			|| opcode == opc_dastore) ? 2 : 1;
-	    mergeInfo(instr.nextByAddr, info.pop(3));
+	    mergeInfo(instr.nextByAddr, info.pop(2+size));
 	    break;
 	}
         case opc_pop: case opc_pop2: