avoid phase change on error

ballerina-platform · Dec 17, 2024 · 4487308 · 4487308
1 parent 8229d95
commit 4487308
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Core.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Core.java
@@ -297,12 +297,12 @@ public static boolean isNever(SemType t) {
     public static boolean isSubType(Context cx, SemType t1, SemType t2) {
         try {
             cx.enterTypeCheckingPhase(t1, t2);
-            return isEmpty(cx, diff(t1, t2));
+            boolean res = isEmpty(cx, diff(t1, t2));
+            cx.exitTypeCheckingPhase();
+            return res;
         } catch (Exception e) {
             cx.registerAbruptTypeCheckEnd(e);
             throw e;
-        } finally {
-            cx.exitTypeCheckingPhase();
         }
     }
 

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Env.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/Env.java
@@ -329,12 +329,16 @@ void enterTypeResolutionPhase(Context cx, MutableSemType t) throws InterruptedEx
     }
 
     void exitTypeResolutionPhaseAbruptly(Context cx, Exception ex) {
-        typeResolutionSemaphore.release();
-        typeResolutionPhaser.arriveAndDeregister();
-        releaseLock((ReentrantReadWriteLock) atomLock);
-        releaseLock((ReentrantReadWriteLock) recListLock);
-        releaseLock((ReentrantReadWriteLock) recMapLock);
-        releaseLock((ReentrantReadWriteLock) recFunctionLock);
+        try {
+            typeResolutionSemaphore.release();
+            typeResolutionPhaser.arriveAndDeregister();
+            releaseLock((ReentrantReadWriteLock) atomLock);
+            releaseLock((ReentrantReadWriteLock) recListLock);
+            releaseLock((ReentrantReadWriteLock) recMapLock);
+            releaseLock((ReentrantReadWriteLock) recFunctionLock);
+        } catch (Exception ignored) {
+
+        }
         this.selfDiagnosticsRunner.registerAbruptTypeResolutionEnd(cx, ex);
     }