for JIRA JASSIST-95

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

1 files changed, 10 insertions, 1 deletions

diff --git a/src/main/javassist/bytecode/stackmap/MapMaker.java b/src/main/javassist/bytecode/stackmap/MapMaker.java
index 6d2bf685..92cd37c6 100644
--- a/src/main/javassist/bytecode/stackmap/MapMaker.java
+++ b/src/main/javassist/bytecode/stackmap/MapMaker.java
@@ -502,7 +502,16 @@ public class MapMaker extends Tracer {
     }
 
     private void writeVerifyTypeInfo(StackMap.Writer writer, ConstPool cp, TypeData[] types, int num) {
-        writer.write16bit(num);
+        int numDWord = 0;
+        for (int i = 0; i < num; i++) {
+            TypeData td = types[i];
+            if (td != null && td.is2WordType()) {
+                numDWord++;
+                i++;
+            }
+        }
+
+        writer.write16bit(num - numDWord);
         for (int i = 0; i < num; i++) {
             TypeData td = types[i];
             if (td == TOP)