Avoid caching narrow type

ballerina-platform · Feb 28, 2025 · cca787b · cca787b
1 parent f38db34
commit cca787b
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 5 deletions.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/TypeCreator.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/creators/TypeCreator.java
@@ -551,16 +551,17 @@ private static BRecordType registeredRecordType(String typeName, Module pkg) {
     public static void registerRecordType(BRecordType recordType) {
         String name = recordType.getName();
         Module pkg = recordType.getPackage();
-        if (name == null || pkg == null) {
-            return;
-        }
-        if (name.contains("$anon")) {
+        TypeIdentifier typeIdentifier = new TypeIdentifier(pkg, name);
+        if (typeIdentifier.avoidCaching()) {
             return;
         }
-        TypeIdentifier typeIdentifier = new TypeIdentifier(pkg, name);
         registeredRecordTypes.put(typeIdentifier, recordType);
     }
 
+    private static boolean avoidCaching(String name, Module pkg) {
+        return name == null || pkg == null || name.contains("$anon") || name.contains("narrowType");
+    }
+
     public static void resetAllCaches() {
         RecordTypeCache.cache.clear();
     }

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/TypeIdentifier.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/api/types/TypeIdentifier.java
@@ -33,4 +33,9 @@ public record TypeIdentifier(Module pkg, String typeName) {
         assert typeName != null;
         assert pkg != null;
     }
+
+    public boolean avoidCaching() {
+        return typeName == null || pkg == null || typeName.contains("$anon") || typeName.contains("narrowType");
+    }
+
 }
diff --git a/...a-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/TypeCheckCacheFactory.java b/...a-runtime/src/main/java/io/ballerina/runtime/api/types/semtype/TypeCheckCacheFactory.java
@@ -37,6 +37,9 @@ private TypeCheckCacheFactory() {
     }
 
     public static TypeCheckCache get(TypeIdentifier identifier) {
+        if (identifier.avoidCaching()) {
+            return create();
+        }
         var cached = cache.get(identifier);
         if (cached != null) {
             return cached;

diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/TypeIdSupplier.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/TypeIdSupplier.java
@@ -51,6 +51,9 @@ private TypeIdSupplier() {
     }
 
     public static int namedId(TypeIdentifier id) {
+        if (id.avoidCaching()) {
+            return getAnonId();
+        }
         var cachedId = cache.get(id);
         if (cachedId != null) {
             return cachedId;