Merge branch 'trask/asm-fix-verify-error-operand-stack-overflow'

asm/src/main/java/org/objectweb/asm/MethodWriter.java

@@ -854,7 +854,12 @@ final class MethodWriter extends MethodVisitor {
 
     if (compute == COMPUTE_MAX_STACK_AND_LOCAL_FROM_FRAMES) {
       relativeStackSize = nStack;
-      if (nStack > maxRelativeStackSize) {
+      for (int i = 0; i < nStack; ++i) {
+        if (stack[i] == Opcodes.LONG || stack[i] == Opcodes.DOUBLE) {
+          relativeStackSize++;
+        }
+      }
+      if (relativeStackSize > maxRelativeStackSize) {
         maxRelativeStackSize = relativeStackSize;
       }
     }

asm/src/test/java/org/objectweb/asm/ClassWriterComputeMaxsTest.java

@@ -1128,4 +1128,19 @@ public class ClassWriterComputeMaxsTest {
 
     assertMaxs(1, 1);
   }
+
+  @Test
+  public void testComputeMaxsFromFrameWithLong() {
+    init(Opcodes.V1_7);
+    Label l0 = new Label();
+
+    methodVisitor.visitMethodInsn(Opcodes.INVOKESTATIC, "ABC", "get", "()J", false);
+    GOTO(l0);
+    LABEL(l0);
+    methodVisitor.visitFrame(Opcodes.F_NEW, 0, null, 1, new Object[] {Opcodes.LONG});
+    ACONST_NULL();
+    RETURN();
+
+    assertMaxs(3, 1);
+  }
 }