[Master] Generate new typedesc instruction for record and tuple when type descriptor resolving

.github/workflows/pull_request_full_build.yml

@@ -92,6 +92,12 @@ jobs:
           do git clone https://github.com/ballerina-platform/${module_name}.git; \
           done
 
+#      - name: Checkout non-default branch
+#        run: |
+#          for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); do \
+#          cd $module_name && git fetch origin && git checkout -t origin/typeDesc-stmt || : && cd ..; \
+#          done
+
       - name: Update Lang Version in Module
         run: |
           for module_name in $(jq -r '.standard_library| .[] | select(.level==${{ matrix.level }}) | .name' extensions.json); do \

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/types/BTupleType.java

@@ -209,6 +209,10 @@ private void computeStringRepresentation() {
         if (cachedToString != null) {
             return;
         }
+        if (typeName != null && !typeName.isEmpty()) {
+            cachedToString = typeName;
+            return;
+        }
         StringBuilder stringRep =
                 new StringBuilder("[").append(tupleTypes.stream().map(Type::toString).collect(Collectors.joining(",")));
         if (restType != null) {

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/utils/MapUtils.java

@@ -53,7 +53,7 @@ private MapUtils() {
     }
 
     public static void handleMapStore(MapValue<BString, Object> mapValue, BString fieldName, Object value) {
-        updateMapValue(TypeUtils.getImpliedType(mapValue.getType()), mapValue, fieldName, value);
+        updateMapValue(mapValue.getType(), mapValue, fieldName, value);
     }
 
     public static void handleInherentTypeViolatingMapUpdate(Object value, BMapType mapType) {
@@ -149,7 +149,7 @@ public static void checkIsMapOnlyOperation(Type mapType, String op) {
 
     private static void updateMapValue(Type mapType, MapValue<BString, Object> mapValue, BString fieldName,
                                        Object value) {
-
+        mapType = TypeUtils.getImpliedType(mapType);
         switch (mapType.getTag()) {
             case TypeTags.MAP_TAG:
                 handleInherentTypeViolatingMapUpdate(value, (BMapType) mapType);

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/ReadOnlyUtils.java

@@ -288,11 +288,8 @@ private static BIntersectionType setImmutableIntersectionType(Type type, Set<Typ
                 }
                 return objectIntersectionType;
             case TypeTags.TYPE_REFERENCED_TYPE_TAG:
-                BTypeReferenceType bType = (BTypeReferenceType) type;
-                BTypeReferenceType refType = new BTypeReferenceType(bType.getName(), bType.getPkg(),
-                        bType.getTypeFlags(), true);
-                refType.setReferredType(getImmutableType(bType.getReferredType(), unresolvedTypes));
-                return createAndSetImmutableIntersectionType(bType, refType);
+                return createAndSetImmutableIntersectionType(type,
+                        getImmutableType(((BTypeReferenceType) type).getReferredType(), unresolvedTypes));
             case TypeTags.ANY_TAG:
             case TypeTags.ANYDATA_TAG:
             case TypeTags.JSON_TAG:

bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/values/TypedescValueImpl.java

@@ -54,7 +54,6 @@ public class TypedescValueImpl implements TypedescValue {
 
     final Type type;
     final Type describingType; // Type of the value describe by this typedesc.
-    public MapValue<?, ?>[] closures;
     public MapValue<?, ?> annotations;
     private BTypedesc typedesc;
 
@@ -63,14 +62,8 @@ public TypedescValueImpl(Type describingType) {
         this.describingType = describingType;
     }
 
-    public TypedescValueImpl(Type describingType, MapValue<?, ?>[] closures) {
-        this.type = new BTypedescType(describingType);
-        this.describingType = describingType;
-        this.closures = closures;
-    }
-
-    public TypedescValueImpl(Type describingType, MapValue<?, ?>[] closures, MapValue<BString, Object> annotations) {
-        this(describingType, closures);
+    public TypedescValueImpl(Type describingType, MapValue<BString, Object> annotations) {
+        this(describingType);
         this.annotations = annotations;
         ((BAnnotatableType) describingType).setAnnotations(annotations);
     }

compiler/ballerina-lang/spotbugs-exclude.xml

@@ -500,4 +500,9 @@
         <Method name="performCodeGen"/>
         <Bug pattern="RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE" />
     </Match>
+    <Match>
+        <Class name="org.wso2.ballerinalang.compiler.bir.codegen.optimizer.LargeMethodOptimizer" />
+        <Method name="restoreOriginalArgsFromTuple" />
+        <Bug pattern="BC_UNCONFIRMED_CAST" />
+    </Match>
 </FindBugsFilter>

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmConstants.java

@@ -64,7 +64,6 @@ public final class JvmConstants {
     public static final String XML_QNAME = "io/ballerina/runtime/internal/values/XmlQName";
     public static final String FUTURE_VALUE = "io/ballerina/runtime/internal/values/FutureValue";
     public static final String TYPEDESC_VALUE_IMPL = "io/ballerina/runtime/internal/values/TypedescValueImpl";
-    public static final String TYPEDESC_VALUE_IMPL_CLOSURES = "closures";
     public static final String TYPEDESC_VALUE = "io/ballerina/runtime/internal/values/TypedescValue";
     public static final String HANDLE_VALUE = "io/ballerina/runtime/internal/values/HandleValue";
     public static final String LOCK_STORE = "io/ballerina/runtime/internal/lock/BLockStore";

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmInstructionGen.java

@@ -52,7 +52,6 @@
 import org.wso2.ballerinalang.compiler.semantics.model.types.BObjectType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BRecordType;
 import org.wso2.ballerinalang.compiler.semantics.model.types.BType;
-import org.wso2.ballerinalang.compiler.semantics.model.types.BTypeReferenceType;
 import org.wso2.ballerinalang.compiler.util.TypeTags;
 import org.wso2.ballerinalang.util.Flags;
 
@@ -66,7 +65,6 @@
 import static org.objectweb.asm.Opcodes.ALOAD;
 import static org.objectweb.asm.Opcodes.ANEWARRAY;
 import static org.objectweb.asm.Opcodes.ASTORE;
-import static org.objectweb.asm.Opcodes.BIPUSH;
 import static org.objectweb.asm.Opcodes.CHECKCAST;
 import static org.objectweb.asm.Opcodes.DADD;
 import static org.objectweb.asm.Opcodes.DCMPL;
@@ -223,7 +221,6 @@
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.GET_MODULE;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.GET_STRING_AT;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.GET_STRING_FROM_ARRAY;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.GET_TYPEDESC;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.GET_TYPEDESC_OF_OBJECT;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.HANDLE_MAP_STORE;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.HANDLE_TABLE_STORE;
@@ -502,9 +499,8 @@ private void generateJLargeArrayIns(int localVarOffset, JLargeArrayInstruction i
             jvmTypeGen.loadType(this.mv, inst.type);
             loadListInitialValues(inst);
             BType elementType = JvmCodeGenUtil.getImpliedType(((BArrayType) instType).eType);
-            if (elementType.tag == TypeTags.RECORD || (elementType.tag == TypeTags.INTERSECTION &&
-                    ((BIntersectionType) elementType).effectiveType.tag == TypeTags.RECORD)) {
-                visitNewRecordArray(elementType);
+            if (elementType.tag == TypeTags.RECORD) {
+                visitNewRecordArray(inst.elementTypedescOp.variableDcl);
             } else {
                 this.mv.visitMethodInsn(INVOKESPECIAL, ARRAY_VALUE_IMPL, JVM_INIT_METHOD,
                         INIT_ARRAY, false);
@@ -1421,7 +1417,7 @@ void generateArrayNewIns(BIRNonTerminator.NewArray inst, int localVarOffset) {
             BType elementType = JvmCodeGenUtil.getImpliedType(((BArrayType) instType).eType);
 
             if (elementType.tag == TypeTags.RECORD) {
-                visitNewRecordArray(elementType);
+                visitNewRecordArray(inst.elementTypedescOp.variableDcl);
             } else {
                 this.mv.visitMethodInsn(INVOKESPECIAL, ARRAY_VALUE_IMPL, JVM_INIT_METHOD,
                         INIT_ARRAY, false);
@@ -1437,12 +1433,8 @@ void generateArrayNewIns(BIRNonTerminator.NewArray inst, int localVarOffset) {
         }
     }
 
-    private void visitNewRecordArray(BType type) {
-        BType elementType = JvmCodeGenUtil.getImpliedType(type);
-        String typeOwner = JvmCodeGenUtil.getPackageName(type.tsymbol.pkgID) + MODULE_INIT_CLASS_NAME;
-        String typedescFieldName =
-                jvmTypeGen.getTypedescFieldName(toNameString(elementType));
-        this.mv.visitFieldInsn(GETSTATIC, typeOwner, typedescFieldName, "L" + TYPEDESC_VALUE + ";");
+    private void visitNewRecordArray(BIRNode.BIRVariableDcl elementTypeDesc) {
+        this.loadVar(elementTypeDesc);
         this.mv.visitMethodInsn(INVOKESPECIAL, ARRAY_VALUE_IMPL, JVM_INIT_METHOD,
                 INIT_ARRAY_WITH_INITIAL_VALUES, false);
     }
@@ -2000,54 +1992,23 @@ void generateNegateIns(BIRNonTerminator.UnaryOP unaryOp) {
     }
 
     void generateNewTypedescIns(BIRNonTerminator.NewTypeDesc newTypeDesc) {
-        List<BIROperand> closureVars = newTypeDesc.closureVars;
-        if (isNonReferredRecord(newTypeDesc.type)) {
-            BType type = JvmCodeGenUtil.getImpliedType(newTypeDesc.type);
-            PackageID packageID = type.tsymbol.pkgID;
-            String typeOwner = JvmCodeGenUtil.getPackageName(packageID) + MODULE_INIT_CLASS_NAME;
-            String fieldName = jvmTypeGen.getTypedescFieldName(toNameString(type));
-            mv.visitFieldInsn(GETSTATIC, typeOwner, fieldName, GET_TYPEDESC);
-        } else {
-            generateNewTypedescCreate(newTypeDesc.type, closureVars, newTypeDesc.annotations);
-        }
-        this.storeToVar(newTypeDesc.lhsOp.variableDcl);
-    }
-
-    private boolean isNonReferredRecord(BType type) {
-        if (type.tag != TypeTags.TYPEREFDESC) {
-            return false;
-        }
-        BType referredType = ((BTypeReferenceType) type).referredType;
-        return referredType.tag == TypeTags.RECORD &&
-                type.getQualifiedTypeName().equals(referredType.getQualifiedTypeName());
-    }
-
-    private void generateNewTypedescCreate(BType btype, List<BIROperand> closureVars, BIROperand annotations) {
-        BType type = JvmCodeGenUtil.getImpliedType(btype);
         String className = TYPEDESC_VALUE_IMPL;
+        BType type = JvmCodeGenUtil.getImpliedType(newTypeDesc.type);
         if (type.tag == TypeTags.RECORD) {
             className = getTypeDescClassName(JvmCodeGenUtil.getPackageName(type.tsymbol.pkgID), toNameString(type));
         }
         this.mv.visitTypeInsn(NEW, className);
         this.mv.visitInsn(DUP);
-        jvmTypeGen.loadType(this.mv, btype);
-
-        mv.visitIntInsn(BIPUSH, closureVars.size());
-        mv.visitTypeInsn(ANEWARRAY, MAP_VALUE);
-        for (int i = 0; i < closureVars.size(); i++) {
-            BIROperand closureVar = closureVars.get(i);
-            mv.visitInsn(DUP);
-            mv.visitIntInsn(BIPUSH, i);
-            this.loadVar(closureVar.variableDcl);
-            mv.visitInsn(AASTORE);
-        }
+        jvmTypeGen.loadType(this.mv, newTypeDesc.type);
+        BIROperand annotations = newTypeDesc.annotations;
         if (annotations != null) {
             this.loadVar(annotations.variableDcl);
             this.mv.visitMethodInsn(INVOKESPECIAL, className, JVM_INIT_METHOD, TYPE_DESC_CONSTRUCTOR_WITH_ANNOTATIONS,
-                                    false);
+                    false);
         } else {
             this.mv.visitMethodInsn(INVOKESPECIAL, className, JVM_INIT_METHOD, TYPE_DESC_CONSTRUCTOR, false);
         }
+        this.storeToVar(newTypeDesc.lhsOp.variableDcl);
     }
 
     void loadVar(BIRNode.BIRVariableDcl varDcl) {

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmSignatures.java

@@ -471,8 +471,8 @@ public final class JvmSignatures {
     public static final String TO_STRING_RETURN = "()L" + STRING_VALUE + ";";
     public static final String TUPLE_SET_MEMBERS_METHOD = "(L" + LIST + ";L" + TYPE + ";)V";
     public static final String TWO_OBJECTS_ARGS = "(L" + OBJECT + ";L" + OBJECT + ";)V";
-    public static final String TYPE_DESC_CONSTRUCTOR = "(L" + TYPE + ";[L" + MAP_VALUE + ";)V";
-    public static final String TYPE_DESC_CONSTRUCTOR_WITH_ANNOTATIONS = "(L" + TYPE + ";[L" + MAP_VALUE + ";L" +
+    public static final String TYPE_DESC_CONSTRUCTOR = "(L" + TYPE + ";)V";
+    public static final String TYPE_DESC_CONSTRUCTOR_WITH_ANNOTATIONS = "(L" + TYPE + ";L" +
             MAP_VALUE + ";)V";
     public static final String TYPE_PARAMETER = "(L" + TYPE + ";)V";
     public static final String VALUE_OF_JSTRING = "(L" + OBJECT + ";)L" + STRING_VALUE + ";";

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmTypeGen.java

@@ -239,7 +239,11 @@ void generateUserDefinedTypeFields(ClassWriter cw, List<BIRTypeDefinition> typeD
             }
             String name = typeDef.internalName.value;
             generateTypeField(cw, name);
-            generateTypedescField(cw, name);
+            // Exclude field generation for typedesc when generating fields for user defined types since
+            // those fields will be generated when visiting global variables
+            if (bTypeTag != TypeTags.RECORD && bTypeTag != TypeTags.TUPLE) {
+                generateTypedescField(cw, name);
+            }
         }
     }
 
@@ -847,7 +851,7 @@ public static String getTypeFieldName(String typeName) {
     }
 
     public String getTypedescFieldName(String name) {
-        return "$typedesce$" + name;
+        return "$typedesc$" + name;
     }
 
     private void loadFutureType(MethodVisitor mv, BFutureType bType) {

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/JvmValueGen.java

@@ -64,10 +64,8 @@
 import static org.objectweb.asm.Opcodes.IRETURN;
 import static org.objectweb.asm.Opcodes.ISTORE;
 import static org.objectweb.asm.Opcodes.NEW;
-import static org.objectweb.asm.Opcodes.POP;
 import static org.objectweb.asm.Opcodes.PUTFIELD;
 import static org.objectweb.asm.Opcodes.RETURN;
-import static org.objectweb.asm.Opcodes.SWAP;
 import static org.objectweb.asm.Opcodes.V21;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmCodeGenUtil.toNameString;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.ABSTRACT_OBJECT_VALUE;
@@ -87,13 +85,11 @@
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.TYPEDESC_CLASS_PREFIX;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.TYPEDESC_VALUE;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.TYPEDESC_VALUE_IMPL;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.TYPEDESC_VALUE_IMPL_CLOSURES;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.TYPE_IMPL;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.UNSUPPORTED_OPERATION_EXCEPTION;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmConstants.VALUE_CLASS_PREFIX;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmDesugarPhase.addDefaultableBooleanVarsToSignature;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.CAST_B_MAPPING_INITIAL_VALUE_ENTRY;
-import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.GET_MAP_ARRAY;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.GET_MAP_VALUE;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.INIT_TYPEDESC;
 import static org.wso2.ballerinalang.compiler.bir.codegen.JvmSignatures.INSTANTIATE;
@@ -257,14 +253,6 @@ private void createInstantiateMethodWithInitialValues(ClassWriter cw, BRecordTyp
         mv.visitVarInsn(ALOAD, 0);
         mv.visitMethodInsn(INVOKESPECIAL, className, JVM_INIT_METHOD, INIT_TYPEDESC, false);
 
-        // Invoke the init-function of this type.
-        mv.visitVarInsn(ALOAD, 1);
-        mv.visitInsn(SWAP);
-        mv.visitVarInsn(ALOAD, 0);
-        mv.visitFieldInsn(GETFIELD, TYPEDESC_VALUE_IMPL, TYPEDESC_VALUE_IMPL_CLOSURES,
-                          GET_MAP_ARRAY);
-        mv.visitInsn(POP);
-
         // Invoke the init-function of this type.
         String valueClassName;
         List<BIRFunction> attachedFuncs = typeDef.attachedFuncs;
@@ -336,7 +324,6 @@ private void createTypeDescConstructor(ClassWriter cw, String className) {
         // load type
         mv.visitVarInsn(ALOAD, 1);
 
-        mv.visitVarInsn(ALOAD, 2);
         // invoke `super(type)`;
         mv.visitMethodInsn(INVOKESPECIAL, TYPEDESC_VALUE_IMPL, JVM_INIT_METHOD, descriptor, false);
 
@@ -351,16 +338,14 @@ private void createTypeDescConstructorWithAnnotations(ClassWriter cw, String nam
         mv.visitCode();
 
         mv.visitVarInsn(ALOAD, 0);
-        mv.visitVarInsn(ALOAD, 3);
+        mv.visitVarInsn(ALOAD, 2);
         mv.visitFieldInsn(PUTFIELD, name, ANNOTATIONS_FIELD, GET_MAP_VALUE);
         // load super
         mv.visitVarInsn(ALOAD, 0);
         // load type
         mv.visitVarInsn(ALOAD, 1);
-        // load closures
-        mv.visitVarInsn(ALOAD, 2);
         // load annotations
-        mv.visitVarInsn(ALOAD, 3);
+        mv.visitVarInsn(ALOAD, 2);
         // invoke `super(type)`;
         mv.visitMethodInsn(INVOKESPECIAL, TYPEDESC_VALUE_IMPL, JVM_INIT_METHOD, TYPE_DESC_CONSTRUCTOR_WITH_ANNOTATIONS,
                            false);

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/bir/codegen/model/JLargeArrayInstruction.java

@@ -31,6 +31,7 @@
 public class JLargeArrayInstruction extends JInstruction {
 
     public BIROperand typedescOp;
+    public BIROperand elementTypedescOp;
     public BIROperand sizeOp;
     public BType type;
     public BIROperand values;
@@ -46,9 +47,10 @@ public JLargeArrayInstruction(Location location, BType type, BIROperand lhsOp, B
     }
 
     public JLargeArrayInstruction(Location location, BType type, BIROperand lhsOp, BIROperand typedescOp,
-                                  BIROperand sizeOp, BIROperand values) {
+                                  BIROperand elementTypedescOp, BIROperand sizeOp, BIROperand values) {
         this(location, type, lhsOp, sizeOp, values);
         this.typedescOp = typedescOp;
+        this.elementTypedescOp = elementTypedescOp;
     }
 
     @Override