Merge branch '318009-fix-analyzer-regression' into 'master'

ASM Analyzer: fix regression introduced in fix of bug #317991.

Closes #318009

See merge request asm/asm!388

Author: ebruneton

asm-analysis/src/main/java/org/objectweb/asm/tree/analysis/Analyzer.java

@@ -123,7 +123,7 @@ public Frame<V>[] analyze(final String owner, final MethodNode method) throws An
       TryCatchBlockNode tryCatchBlock = method.tryCatchBlocks.get(i);
       int startIndex = insnList.indexOf(tryCatchBlock.start);
       int endIndex = insnList.indexOf(tryCatchBlock.end);
-      for (int j = startIndex; j <= endIndex; ++j) {
+      for (int j = startIndex; j < endIndex; ++j) {
         List<TryCatchBlockNode> insnHandlers = handlers[j];
         if (insnHandlers == null) {
           insnHandlers = new ArrayList<>();
@@ -263,9 +263,18 @@ public Frame<V>[] analyze(final String owner, final MethodNode method) throws An
               catchType = Type.getObjectType(tryCatchBlock.type);
             }
             if (newControlFlowExceptionEdge(insnIndex, tryCatchBlock)) {
+              // Merge the frame *before* this instruction, with its stack cleared and an exception
+              // pushed, with the handler's frame.
               Frame<V> handler = newFrame(oldFrame);
+              V exceptionValue = interpreter.newExceptionValue(tryCatchBlock, handler, catchType);
               handler.clearStack();
-              handler.push(interpreter.newExceptionValue(tryCatchBlock, handler, catchType));
+              handler.push(exceptionValue);
+              merge(insnList.indexOf(tryCatchBlock.handler), handler, subroutine);
+              // Merge the frame *after* this instruction, with its stack cleared and an exception
+              // pushed, with the handler's frame.
+              handler = newFrame(currentFrame);
+              handler.clearStack();
+              handler.push(exceptionValue);
               merge(insnList.indexOf(tryCatchBlock.handler), handler, subroutine);
             }
           }

asm-analysis/src/test/java/org/objectweb/asm/tree/analysis/AnalyzerWithBasicVerifierTest.java

@@ -247,6 +247,52 @@ void testAnalyze_invalidMultianewarray() {
     assertEquals("Error at instruction 2: Expected I, but found F", message);
   }
 
+  @Test
+  void testAnalyze_validMethodWithExceptionHandlers() {
+    Label label0 = new Label();
+    Label label1 = new Label();
+    Label label2 = new Label();
+    Label label3 = new Label();
+    Label label4 = new Label();
+    Label label5 = new Label();
+    Label label6 = new Label();
+    MethodNode methodNode =
+        new MethodNodeBuilder("(Ljava/lang/Object;)V", 3, 3)
+            .trycatch(label0, label1, label2, "java/lang/Exception")
+            .trycatch(label1, label3, label4, null)
+            .trycatch(label5, label6, label4, null)
+            .trycatch(label6, label2, label2, "java/lang/Exception")
+            .aload(0)
+            .ifnonnull(label0)
+            .aconst_null()
+            .athrow()
+            .label(label0)
+            .aload(0)
+            .astore(2)
+            .label(label1)
+            .nop()
+            .aload(2)
+            .pop()
+            .label(label3)
+            .vreturn()
+            .label(label4)
+            .astore(1)
+            .label(label5)
+            .aload(2)
+            .pop()
+            .label(label6)
+            .aload(1)
+            .athrow()
+            .label(label2)
+            .astore(1)
+            .go(label3)
+            .build();
+
+    Executable analyze = () -> newAnalyzer().analyze(CLASS_NAME, methodNode);
+
+    assertDoesNotThrow(analyze);
+  }
+
   /**
    * Tests that the precompiled classes can be successfully analyzed with a BasicVerifier.
    *