Address review suggestions

Address review suggestions and do type constraint equality check to identity the typedesc in different packages

Author: rdulmina

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

@@ -34,6 +34,7 @@
 import org.ballerinalang.model.tree.OperatorKind;
 import org.ballerinalang.model.tree.TopLevelNode;
 import org.ballerinalang.model.tree.expressions.RecordLiteralNode;
+import org.ballerinalang.model.types.TypeKind;
 import org.wso2.ballerinalang.compiler.bir.model.BIRNode;
 import org.wso2.ballerinalang.compiler.bir.model.BIRNode.BIRAnnotation;
 import org.wso2.ballerinalang.compiler.bir.model.BIRNode.BIRAnnotationAttachment;
@@ -2434,7 +2435,7 @@ private BIRVariableDcl getOrCreateTypedescVariable(BType type, Location pos) {
             return variableDcl;
         }
 
-        variableDcl = findInPackageScope(type);
+        variableDcl = findInDifferentPackage(type);
         if (variableDcl != null && variableDcl.initialized) {
             return variableDcl;
         }
@@ -2446,16 +2447,24 @@ private BIRVariableDcl getOrCreateTypedescVariable(BType type, Location pos) {
         return this.env.targetOperand.variableDcl;
     }
 
-    private BIRVariableDcl findInPackageScope(BType type) {
+    private BIRVariableDcl findInDifferentPackage(BType type) {
         BTypeSymbol typeSymbol = type.tsymbol;
         if (typeSymbol == null || typeSymbol.owner.tag != SymTag.PACKAGE ||
                 isInSameModule(typeSymbol, env.enclPkg.packageID)) {
             return null;
         }
         BPackageSymbol packageSymbol = (BPackageSymbol) typeSymbol.owner;
-        Scope.ScopeEntry scopeEntry =
-                packageSymbol.scope.lookup(new Name(TYPEDESC + typeSymbol.name.value));
-        BSymbol symbol = scopeEntry.symbol;
+        BSymbol symbol = packageSymbol.scope.entries.entrySet().stream()
+                .filter(entry -> entry.getKey().value.startsWith(TYPEDESC))
+                .map(entry -> entry.getValue().symbol)
+                .filter(entrySymbol -> {
+                    BType symbolType = entrySymbol.getType();
+                    return symbolType.getKind() == TypeKind.TYPEDESC &&
+                            ((BTypedescType) symbolType).constraint == type;
+                })
+                .findFirst()
+                .orElse(null);
+
         return symbol != null ? getVarRef(createPackageVarRef(symbol)) : null;
     }
 
@@ -2504,9 +2513,7 @@ private void createNewTypedescInst(BType resolveType, Location position) {
         BTypeSymbol typeSymbol = resolveType.tsymbol;
         BIRVariableDcl tempVarDcl = createTempVariable();
         BIROperand toVarRef = new BIROperand(tempVarDcl);
-
         BIRNonTerminator.NewTypeDesc newTypeDesc = createNewTypeDesc(position, toVarRef, resolveType, typeSymbol);
-
         this.env.targetOperand = toVarRef;
         setScopeAndEmit(newTypeDesc);
     }
@@ -2812,7 +2819,6 @@ private void generateListConstructorExpr(BLangListConstructorExpr listConstructo
                                                        VarScope.FUNCTION, VarKind.TEMP);
         this.env.enclFunc.localVars.add(tempVarDcl);
         BIROperand toVarRef = new BIROperand(tempVarDcl);
-
         BType listConstructorExprType = listConstructorExpr.getBType();
 
         List<BLangExpression> exprs = listConstructorExpr.exprs;

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

@@ -97,7 +97,7 @@ public class LargeMethodOptimizer {
     // splits are done only if the newly created method will contain more instructions than the below number
     private static final int SPLIT_INSTRUCTION_COUNT_THRESHOLD = 25;
     // splits are done only if the newly created method will have less function arguments than the below number
-    private static final int MAX_SPLIT_FUNCTION_ARG_COUNT = 93;
+    private static final int MAX_SPLIT_FUNCTION_ARG_COUNT = 90;
     // total least no. of terminators and non-terminators that should be there to make the periodic split
     private static final int INS_COUNT_PERIODIC_SPLIT_THRESHOLD = 500;
     // current BIR package id
@@ -845,7 +845,7 @@ private void splitParentFuncForPeriodicArraySplits(BIRFunction parentFunc, List<
         for (int bbIndex = 0; bbIndex < bbs.size() - 1; bbIndex++) {
             BIRBasicBlock bb = bbs.get(bbIndex);
             handleBasicBlockStart(splitFuncEnv, nextBBPendingIns, bb);
-            // skip large arg restore and array size ins
+            // skips large argument restore instructions and array size instruction
             int insIndex = bbIndex == 0 ? skipLargeArgRestoreInstsAndGetIndex(bb) + 1 : 0;
             for (; insIndex < bb.instructions.size(); insIndex++) {
                 if ((bbIndex == newArrayInsBBNum) && (insIndex == newArrayInsNumInRelevantBB)) {

compiler/ballerina-lang/src/main/java/org/wso2/ballerinalang/compiler/desugar/Desugar.java

@@ -853,7 +853,6 @@ public void visit(BLangPackage pkgNode) {
         }
         pkgNode.completedPhases.add(CompilerPhase.DESUGAR);
         clearGlobalVariables();
-
         result = pkgNode;
     }
 
@@ -9007,7 +9006,6 @@ public void visit(BLangConstant constant) {
         } else {
             constant.expr = rewriteExpr(constant.expr);
         }
-
         constant.annAttachments.forEach(attachment ->  rewrite(attachment, env));
         result = constant;
     }

tests/jballerina-unit-test/src/test/java/org/ballerinalang/test/bir/TypeDescBIRTest.java

@@ -62,7 +62,6 @@ private String readFile(String name) throws IOException {
             try (Stream<String> stream = Files.lines(filePath, StandardCharsets.UTF_8)) {
                 stream.forEach(s -> contentBuilder.append(s).append("\n"));
             }
-
             return contentBuilder.toString().trim();
         }
         Assert.fail("Expected BIR file not found for test: " + name);