Merge pull request #42274 from HindujaB/fix-service-fill-value

Fix filler value check for service objects returning null
ballerina-platform · Mar 14, 2024 · 5ccd423 · 5ccd423
2 parents 7f858d4 + c725212
commit 5ccd423
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 12 deletions.
diff --git a/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java b/bvm/ballerina-runtime/src/main/java/io/ballerina/runtime/internal/TypeChecker.java
@@ -3398,6 +3398,7 @@ private static boolean hasFillerValue(Type type, List<Type> unanalyzedTypes) {
             case TypeTags.FINITE_TYPE_TAG:
                 return checkFillerValue((BFiniteType) type);
             case TypeTags.OBJECT_TYPE_TAG:
+            case TypeTags.SERVICE_TAG:
                 return checkFillerValue((BObjectType) type);
             case TypeTags.RECORD_TYPE_TAG:
                 return checkFillerValue((BRecordType) type, unanalyzedTypes);
@@ -3557,20 +3558,16 @@ private static boolean checkFillerValue(BArrayType type, List<Type> unAnalyzedTy
     }
 
     private static boolean checkFillerValue(BObjectType type) {
-        if (type.getTag() == TypeTags.SERVICE_TAG) {
+        MethodType generatedInitMethod = type.getGeneratedInitMethod();
+        if (generatedInitMethod == null) {
+            // abstract objects doesn't have a filler value.
             return false;
-        } else {
-            MethodType generatedInitMethod = type.getGeneratedInitMethod();
-            if (generatedInitMethod == null) {
-                // abstract objects doesn't have a filler value.
-                return false;
-            }
-            FunctionType initFuncType = generatedInitMethod.getType();
-            // Todo: check defaultable params of the init func as well
-            boolean noParams = initFuncType.getParameters().length == 0;
-            boolean nilReturn = getImpliedType(initFuncType.getReturnType()).getTag() == TypeTags.NULL_TAG;
-            return noParams && nilReturn;
         }
+        FunctionType initFuncType = generatedInitMethod.getType();
+        boolean noParams = initFuncType.getParameters().length == 0;
+        boolean nilReturn = getImpliedType(initFuncType.getReturnType()).getTag() == TypeTags.NULL_TAG;
+        return noParams && nilReturn;
+
     }
 
     private static boolean checkFillerValue(BFiniteType type) {

diff --git a/...erina-unit-test/src/test/resources/test-src/statements/arrays/array_fill_runtime_test.bal b/...erina-unit-test/src/test/resources/test-src/statements/arrays/array_fill_runtime_test.bal
@@ -244,6 +244,7 @@ public function main() {
     tesOneDimensionalArrayWithConstantSizeReferenceFill();
     tesTwoDimensionalArrayWithConstantSizeReferenceFill();
     testAnonRecordTypeWithDefaultValueFill();
+    testServiceClassArrayFilling();
     // testObjectArrayFillingWithDefaultValues();
 }
 
@@ -252,3 +253,14 @@ function assertEqualPanic(anydata expected, anydata actual, string message = "Va
         panic error(message + " Expected : " + expected.toString() + " Actual : " + actual.toString());
     }
 }
+
+service class Class1 {}
+
+service class Class2 {}
+
+public function testServiceClassArrayFilling() {
+    [Class1, Class2] interceptors = [];
+    assertEqualPanic(2, interceptors.length());
+    assertEqualPanic(true, interceptors[0] is Class1);
+    assertEqualPanic(true, interceptors[1] is Class2);
+}