fix bug: default value of parameter

We should not use parameter's default value in the synthesized member-init ctor. The default value should only be used when call site doesn't provide enough arguments, and our invoke system will use those default value to make up the missing arguments. Add '-vk' to few tests to enable vulkan backend test.
shader-slang · Jan 13, 2025 · 093bf71 · 093bf71
1 parent ed51fa1
commit 093bf71
Show file tree

Hide file tree

Showing 7 changed files with 17 additions and 19 deletions.
diff --git a/source/slang/slang-check-decl.cpp b/source/slang/slang-check-decl.cpp
@@ -9180,20 +9180,13 @@ Expr* SemanticsDeclBodyVisitor::createCtorParamExpr(ConstructorDecl* ctor, Index
     {
         if (auto param = as<ParamDecl>(ctor->members[paramIndex]))
         {
-            if (param->initExpr)
-            {
-                return param->initExpr;
-            }
-            else
-            {
-                auto paramType = param->getType();
-                auto paramExpr = m_astBuilder->create<VarExpr>();
-                paramExpr->scope = ctor->ownedScope;
-                paramExpr->declRef = param;
-                paramExpr->type = paramType;
-                paramExpr->loc = param->loc;
-                return paramExpr;
-            }
+            auto paramType = param->getType();
+            auto paramExpr = m_astBuilder->create<VarExpr>();
+            paramExpr->scope = ctor->ownedScope;
+            paramExpr->declRef = param;
+            paramExpr->type = paramType;
+            paramExpr->loc = param->loc;
+            return paramExpr;
         }
     }
     return nullptr;
@@ -9255,7 +9248,7 @@ void SemanticsDeclBodyVisitor::synthesizeCtorBodyForBases(
 
         auto assign = m_astBuilder->create<AssignExpr>();
         assign->left =
-            coerce(CoercionSite::Initializer, declInfo.defaultCtor->returnType.type, thisExpr);
+            coerce(CoercionSite::Initializer, baseCtor->returnType.type, thisExpr);
         assign->right = invoke;
 
         auto stmt = m_astBuilder->create<ExpressionStmt>();

diff --git a/tests/compute/struct-default-init.slang b/tests/compute/struct-default-init.slang
@@ -1,5 +1,6 @@
 // struct-default-init.slang
 //TEST(compute):COMPARE_COMPUTE: -shaderobj
+//TEST(compute):COMPARE_COMPUTE: -vk -shaderobj
 
 struct Test
 {

diff --git a/tests/diagnostics/mismatching-types.slang.expected b/tests/diagnostics/mismatching-types.slang.expected
@@ -17,16 +17,16 @@ tests/diagnostics/mismatching-types.slang(61): error 30019: expected an expressi
 tests/diagnostics/mismatching-types.slang(63): error 30019: expected an expression of type 'GenericOuter<int>.NonGenericInner', got 'GenericOuter<float>.NonGenericInner'
     a.ng = b.ng;
              ^~
-tests/diagnostics/mismatching-types.slang(66): error 30019: expected an expression of type 'GenericInner<int>', got 'int'
+tests/diagnostics/mismatching-types.slang(66): error 30019: expected an expression of type 'NonGenericOuter.GenericInner<int>', got 'int'
     c.i = 0;
           ^
-tests/diagnostics/mismatching-types.slang(68): note: explicit conversion from 'int' to 'GenericInner<int>' is possible
+tests/diagnostics/mismatching-types.slang(68): error 30019: expected an expression of type 'NonGenericOuter.GenericInner<int>', got 'NonGenericOuter.GenericInner<float>'
     c.i = c.f;
             ^
-tests/diagnostics/mismatching-types.slang(72): error 30019: expected an expression of type 'GenericInner<int>.ReallyNested', got 'int'
+tests/diagnostics/mismatching-types.slang(72): error 30019: expected an expression of type 'NonGenericOuter.GenericInner<int>.ReallyNested', got 'int'
     c.i.n = 0;
             ^
-tests/diagnostics/mismatching-types.slang(72): note: explicit conversion from 'int' to 'GenericInner<int>.ReallyNested' is possible
+tests/diagnostics/mismatching-types.slang(72): note: explicit conversion from 'int' to 'NonGenericOuter.GenericInner<int>.ReallyNested' is possible
 tests/diagnostics/mismatching-types.slang(81): error 30019: expected an expression of type 'Texture1D<int>', got 'Texture1D<float>'
     Texture1D<int> t1 = tex;
                         ^~~

diff --git a/tests/language-feature/extensions/interface-extension.slang b/tests/language-feature/extensions/interface-extension.slang
@@ -3,6 +3,7 @@
 // Test that an `extension` applied to an interface type works as users expect
 
 //TEST(compute):COMPARE_COMPUTE: -shaderobj
+//TEST(compute):COMPARE_COMPUTE: -vk -shaderobj
 
 interface ICounter
 {

diff --git a/tests/language-feature/inheritance/derived-struct-init-list.slang b/tests/language-feature/inheritance/derived-struct-init-list.slang
@@ -1,6 +1,7 @@
 // derived-struct-init-list.slang
 
 //TEST(compute):COMPARE_COMPUTE:
+//TEST(compute):COMPARE_COMPUTE: -vk -shaderobj
 
 // Test that use of an initializer list (especially
 // an empty initializer list) is still possible

diff --git a/tests/language-feature/inheritance/struct-inherit-interface-requirement.slang b/tests/language-feature/inheritance/struct-inherit-interface-requirement.slang
@@ -1,6 +1,7 @@
 // struct-inherit-interface-requirement.slang
 
 //TEST(compute):COMPARE_COMPUTE: -shaderobj
+//TEST(compute):COMPARE_COMPUTE: -vk -shaderobj
 
 // Test that a `struct` type can use an inherited
 // member to satisfy an interface requirement.

diff --git a/tests/language-feature/inheritance/struct-inheritance.slang b/tests/language-feature/inheritance/struct-inheritance.slang
@@ -1,6 +1,7 @@
 // struct-inheritance.slang
 
 //TEST(compute):COMPARE_COMPUTE: -shaderobj
+//TEST(compute):COMPARE_COMPUTE: -vk -shaderobj
 
 // Test that we can define a `struct` type
 // that inherits from another `struct`.