Avoid duplicate record type creation

ballerina-platform · Oct 6, 2024 · e453cff · e453cff
1 parent 019797b
commit e453cff
Show file tree

Hide file tree

Showing 2 changed files with 40 additions and 2 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
@@ -50,6 +50,7 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
 
 /**
  * Class @{@link TypeCreator} provides APIs to create ballerina type instances.
@@ -58,6 +59,8 @@
  */
 public final class TypeCreator {
 
+    private static final Map<TypeIdentifier, BRecordType> registeredRecordTypes = new ConcurrentHashMap<>();
+
     /**
      * Creates a new array type with given element type.
      *
@@ -224,6 +227,10 @@ public static MapType createMapType(String typeName, Type constraint, Module mod
      */
     public static RecordType createRecordType(String typeName, Module module, long flags, boolean sealed,
                                               int typeFlags) {
+        BRecordType memo = registeredRecordType(typeName, module);
+        if (memo != null) {
+            return memo;
+        }
         return new BRecordType(typeName, typeName, module, flags, sealed, typeFlags);
     }
 
@@ -240,8 +247,11 @@ public static RecordType createRecordType(String typeName, Module module, long f
      * @return the new record type
      */
     public static RecordType createRecordType(String typeName, Module module, long flags, Map<String, Field> fields,
-                                              Type restFieldType,
-                                              boolean sealed, int typeFlags) {
+                                              Type restFieldType, boolean sealed, int typeFlags) {
+        BRecordType memo = registeredRecordType(typeName, module);
+        if (memo != null) {
+            return memo;
+        }
         return new BRecordType(typeName, module, flags, fields, restFieldType, sealed, typeFlags);
     }
 
@@ -520,4 +530,29 @@ public static FiniteType createFiniteType(String typeName, Set<Object> values, i
 
     private TypeCreator() {
     }
+
+    private static BRecordType registeredRecordType(String typeName, Module pkg) {
+        if (typeName == null || pkg == null) {
+            return null;
+        }
+        return registeredRecordTypes.get(new TypeIdentifier(typeName, pkg));
+    }
+
+    public static void registerRecordType(BRecordType recordType) {
+        String name = recordType.getName();
+        Module pkg = recordType.getPackage();
+        if (name == null || pkg == null) {
+            return;
+        }
+        TypeIdentifier typeIdentifier = new TypeIdentifier(name, pkg);
+        registeredRecordTypes.put(typeIdentifier, recordType);
+    }
+
+    public record TypeIdentifier(String typeName, Module pkg) {
+
+        public TypeIdentifier {
+            assert typeName != null;
+            assert pkg != null;
+        }
+    }
 }
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BRecordType.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BRecordType.java
@@ -21,6 +21,7 @@
 import io.ballerina.identifier.Utils;
 import io.ballerina.runtime.api.Module;
 import io.ballerina.runtime.api.TypeTags;
+import io.ballerina.runtime.api.creators.TypeCreator;
 import io.ballerina.runtime.api.creators.ValueCreator;
 import io.ballerina.runtime.api.flags.SymbolFlags;
 import io.ballerina.runtime.api.flags.TypeFlags;
@@ -94,6 +95,7 @@ public BRecordType(String typeName, String internalName, Module pkg, long flags,
         this.sealed = sealed;
         this.typeFlags = typeFlags;
         this.readonly = SymbolFlags.isFlagOn(flags, SymbolFlags.READONLY);
+        TypeCreator.registerRecordType(this);
     }
 
     /**
@@ -123,6 +125,7 @@ public BRecordType(String typeName, Module pkg, long flags, Map<String, Field> f
             this.fields = fields;
         }
         this.internalName = typeName;
+        TypeCreator.registerRecordType(this);
     }
 
     private Map<String, Field> getReadOnlyFields(Map<String, Field> fields) {