Adding separate construct delegation tests

shader-slang · Aug 24, 2024 · 1744146 · 1744146
1 parent 49d8e2b
commit 1744146
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 42 deletions.
diff --git a/source/slang/slang-ir-use-uninitialized-values.cpp b/source/slang/slang-ir-use-uninitialized-values.cpp
@@ -458,7 +458,6 @@ namespace Slang
     {
         for (auto use = inst->firstUse; use; use = use->nextUse)
         {
-            IRInst* user = use->getUser();
             InstructionUsageType usage = getInstructionUsageType(use->getUser(), inst);
             if (usage == Store || usage == StoreParent)
                 return true;

diff --git a/tests/diagnostics/uninitialized-fields-delegated.slang b/tests/diagnostics/uninitialized-fields-delegated.slang
@@ -0,0 +1,46 @@
+//TEST:SIMPLE(filecheck=CHK): -target spirv
+
+// Delegated constructors
+struct Impl
+{
+    float x;
+
+    __init(float val)
+    {
+        x = val;
+    }
+
+    __init()
+    {
+        float val = 2.0;
+
+        // Shouldn't trigger a warning here
+        return Impl(val);
+    }
+}
+
+// Calling a method from a constructor to initialize fields
+struct HitInfo
+{
+    float3 barycentrics;
+    uint primitiveIndex;
+
+    [[mutating]] void init(float2 hitBarycentrics, uint hitPrimitiveIndex)
+    {
+        barycentrics = { 1.0 - hitBarycentrics.x - hitBarycentrics.y, hitBarycentrics.x, hitBarycentrics.y };
+        primitiveIndex = hitPrimitiveIndex;
+    }
+
+    __init(float2 hitBarycentrics, uint hitPrimitiveIndex)
+    {
+        init(hitBarycentrics, hitPrimitiveIndex);
+    }
+
+    __init(BuiltInTriangleIntersectionAttributes attr)
+    {
+        init(attr.barycentrics, PrimitiveIndex());
+    }
+}
+
+//CHK-NOT: warning 41020
+//CHK-NOT: warning 41021
diff --git a/tests/diagnostics/uninitialized-fields.slang b/tests/diagnostics/uninitialized-fields.slang
@@ -86,46 +86,5 @@ struct Pass
     int y = 0;
 }
 
-struct Impl
-{
-    float x;
-
-    __init(float val)
-    {
-        x = val;
-    }
-
-    __init()
-    {
-        float val = 2.0;
-
-        // Shouldn't trigger a warning here
-        return Impl(val);
-    }
-}
-
-// Calling a method from a constructor to initialize fields
-struct HitInfo
-{
-    float3 barycentrics;
-    uint primitiveIndex;
-
-    [[mutating]] void init(float2 hitBarycentrics, uint hitPrimitiveIndex)
-    {
-        barycentrics = { 1.0 - hitBarycentrics.x - hitBarycentrics.y, hitBarycentrics.x, hitBarycentrics.y };
-        primitiveIndex = hitPrimitiveIndex;
-    }
-
-    __init(float2 hitBarycentrics, uint hitPrimitiveIndex)
-    {
-        init(hitBarycentrics, hitPrimitiveIndex);
-    }
-
-    __init(BuiltInTriangleIntersectionAttributes attr)
-    {
-        init(attr.barycentrics, PrimitiveIndex());
-    }
-}
-
 //CHK-NOT: warning 41020
 //CHK-NOT: warning 41021