From b457f4aaf0f83371b72edbf3b9dbaa85b349f3cb Mon Sep 17 00:00:00 2001
From: Volker Berlin <volker.berlin@googlemail.com>
Date: Thu, 21 May 2020 20:51:48 +0200
Subject: [PATCH] fix cascaded try catch blocks

---
 .../jwebassembly/module/BranchManger.java         | 15 ++++++++++++---
 .../jwebassembly/runtime/Exceptions.java          | 15 +++++++++++++++
 2 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/src/de/inetsoftware/jwebassembly/module/BranchManger.java b/src/de/inetsoftware/jwebassembly/module/BranchManger.java
index 4591fa2..251b0b5 100644
--- a/src/de/inetsoftware/jwebassembly/module/BranchManger.java
+++ b/src/de/inetsoftware/jwebassembly/module/BranchManger.java
@@ -156,7 +156,7 @@ class BranchManger {
      */
     void calculate() {
         addLoops();
-        Collections.sort( allParsedOperations, (a,b) -> Integer.compare( a.startPosition, b.startPosition ) );
+        Collections.sort( allParsedOperations );
         calculate( root, allParsedOperations );
     }
 
@@ -1115,7 +1115,7 @@ class BranchManger {
     /**
      * Description of single block/branch from the parsed Java byte code. The parsed branches are plain.
      */
-    private static class ParsedBlock {
+    private static class ParsedBlock implements Comparable<ParsedBlock> {
         private JavaBlockOperator op;
 
         int                       startPosition;
@@ -1133,6 +1133,15 @@ class BranchManger {
             this.nextPosition = nextPosition;
             this.lineNumber = lineNumber;
         }
+
+        /**
+         * {@inheritDoc}
+         */
+        @Override
+        public int compareTo( ParsedBlock o ) {
+            return startPosition < o.startPosition ? -1 : startPosition > o.startPosition ? 1 : // first order on the start position
+                            -Integer.compare( endPosition, o.endPosition ); // then reverse on the end position that outer blocks occur first
+        }
     }
 
     /**
@@ -1230,7 +1239,7 @@ class BranchManger {
         private final TryCatchFinally tryCatch;
 
         TryCatchParsedBlock( TryCatchFinally tryCatch ) {
-            super( JavaBlockOperator.TRY, tryCatch.getStart(), 0, tryCatch.getStart(), -1 );
+            super( JavaBlockOperator.TRY, tryCatch.getStart(), tryCatch.getEnd() - tryCatch.getStart(), tryCatch.getStart(), -1 );
             this.tryCatch = tryCatch;
         }
     }
diff --git a/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java b/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java
index 4bc3dda..597d770 100644
--- a/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java
+++ b/test/de/inetsoftware/jwebassembly/runtime/Exceptions.java
@@ -51,6 +51,7 @@ public class Exceptions extends AbstractBaseTest {
             addParam( list, script, "tryFinally2" );
             addParam( list, script, "complex" );
             addParam( list, script, "sync" );
+            addParam( list, script, "syncWithInnerTryCatch" );
             addParam( list, script, "emptyCatch" );
             addParam( list, script, "multiCatch" );
         }
@@ -172,6 +173,20 @@ public class Exceptions extends AbstractBaseTest {
             return v;
         }
 
+        @Export
+        static int syncWithInnerTryCatch() {
+            int result;
+            Object obj = new Object();
+            synchronized( obj ) {
+                try {
+                    result = 13;
+                } catch( Exception x ) {
+                    result = 42;
+                }
+            }
+            return result;
+        }
+
         @Export
         static int emptyCatch() {
             int h = 127; // variable slot 0