Skip to content

Commit 24f8999

Browse files
csyonghecsyonghe
authored
Fix incorrect codegen when returning initializer list as existential value. (shader-slang#4618)
* Add `dev` cmake preset. * Fix incorrect codegen when returning initializer list as existential value. * Fix cmake. * Fixup.
1 parent 977e4b2 commit 24f8999

File tree

4 files changed

+224
-20
lines changed

4 files changed

+224
-20
lines changed

‎CMakePresets.json

+9
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,15 @@
3737
"description": "Visual Studio 2022 project",
3838
"generator": "Visual Studio 17 2022"
3939
},
40+
{
41+
"name": "vs2022-dev",
42+
"inherits": "msvc-base",
43+
"description": "Visual Studio 2022 project with debug assisting features",
44+
"generator": "Visual Studio 17 2022",
45+
"cacheVariables": {
46+
"SLANG_ENABLE_IR_BREAK_ALLOC": "TRUE"
47+
}
48+
},
4049
{
4150
"name": "slang-llvm",
4251
"inherits": "default",

‎docs/building.md

+3-1
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,13 @@ cmake --build --preset release # or --preset debug
4040

4141
For Visual Studio run:
4242
```bash
43-
cmake --preset vs2022 # or --preset vs2019
43+
cmake --preset vs2022 # or 'vs2019' or `vs2022-dev`
4444
start devenv ./build/slang.sln # to optionally open the project in Visual Studio
4545
cmake --build --preset release # to build from the CLI
4646
```
4747

48+
The `vs2022-dev` preset turns on features that makes debugging easy.
49+
4850
## Testing
4951

5052
```bash

‎source/slang/slang-check-conversion.cpp

+22-19
Original file line numberDiff line numberDiff line change
@@ -842,29 +842,32 @@ namespace Slang
842842
// Coercion from an initializer list is allowed for many types,
843843
// so we will farm that out to its own subroutine.
844844
//
845-
if( auto fromInitializerListExpr = as<InitializerListExpr>(fromExpr))
845+
if (fromExpr && as<InitializerListType>(fromExpr->type.type))
846846
{
847-
if( !_coerceInitializerList(
848-
toType,
849-
outToExpr,
850-
fromInitializerListExpr) )
847+
if (auto fromInitializerListExpr = as<InitializerListExpr>(fromExpr))
851848
{
852-
return false;
853-
}
849+
if (!_coerceInitializerList(
850+
toType,
851+
outToExpr,
852+
fromInitializerListExpr))
853+
{
854+
return false;
855+
}
854856

855-
// For now, we treat coercion from an initializer list
856-
// as having no cost, so that all conversions from initializer
857-
// lists are equally valid. This is fine given where initializer
858-
// lists are allowed to appear now, but might need to be made
859-
// more strict if we allow for initializer lists in more
860-
// places in the language (e.g., as function arguments).
861-
//
862-
if(outCost)
863-
{
864-
*outCost = kConversionCost_None;
865-
}
857+
// For now, we treat coercion from an initializer list
858+
// as having no cost, so that all conversions from initializer
859+
// lists are equally valid. This is fine given where initializer
860+
// lists are allowed to appear now, but might need to be made
861+
// more strict if we allow for initializer lists in more
862+
// places in the language (e.g., as function arguments).
863+
//
864+
if (outCost)
865+
{
866+
*outCost = kConversionCost_None;
867+
}
866868

867-
return true;
869+
return true;
870+
}
868871
}
869872

870873
// nullptr_t can be cast into any pointer type.

‎tests/language-feature/interfaces/default-construct-conformance.slang

+190
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,190 @@
1+
//TEST:SIMPLE(filecheck=CHECK): -target hlsl -entry testMain -profile cs_6_0
2+
3+
// Test that invoking the default constructor of a type then use the result as an existential value
4+
// works correctly.
5+
6+
RWStructuredBuffer<uint> output;
7+
RWStructuredBuffer<uint> expected;
8+
9+
interface ITest
10+
{
11+
uint getValue();
12+
};
13+
14+
15+
//TEST_INPUT:type_conformance Test0:ITest = 0
16+
struct Test0 : ITest
17+
{
18+
uint getValue() { return 0; }
19+
};
20+
21+
//TEST_INPUT:type_conformance Test1:ITest = 1
22+
struct Test1 : ITest
23+
{
24+
uint getValue() { return 1; }
25+
};
26+
27+
//TEST_INPUT:type_conformance TestAny:ITest = 2
28+
struct TestAny : ITest
29+
{
30+
uint value = 5;
31+
__init(uint v)
32+
{
33+
value = v;
34+
}
35+
36+
uint getValue() { return value; }
37+
}
38+
39+
// CHECK: Tuple{{.*}} makeTest0{{.*}}()
40+
// CHECK: Tuple{{.*}} = { uint2(0U, 0U), uint2(0U, 0U), packAnyValue4{{.*}} };
41+
ITest makeTest0()
42+
{
43+
return Test0();
44+
}
45+
46+
// CHECK: Tuple{{.*}} makeTest1{{.*}}()
47+
// CHECK: Tuple{{.*}} = { uint2(0U, 0U), uint2(1U, 0U), packAnyValue4{{.*}} };
48+
ITest makeTest1()
49+
{
50+
return Test1();
51+
}
52+
53+
// CHECK: Tuple{{.*}} makeTestAny{{.*}}()
54+
// CHECK: Tuple{{.*}} = { uint2(0U, 0U), uint2(2U, 0U), packAnyValue4{{.*}} };
55+
ITest makeTestAny()
56+
{
57+
return TestAny();
58+
}
59+
60+
ITest makeTestAny(uint v)
61+
{
62+
return TestAny(v);
63+
}
64+
65+
66+
[numthreads(16, 1, 1)]
67+
void testMain(uint3 threadID: SV_DispatchThreadID)
68+
{
69+
if (threadID.x != 0)
70+
return;
71+
72+
int outputIdx = 0;
73+
74+
/// Test0
75+
{
76+
Test0 test;
77+
output[outputIdx] = test.getValue();
78+
expected[outputIdx++] = 0;
79+
}
80+
81+
{
82+
ITest test = Test0();
83+
output[outputIdx] = test.getValue();
84+
expected[outputIdx++] = 0;
85+
}
86+
87+
{
88+
output[outputIdx] = Test0().getValue();
89+
expected[outputIdx++] = 0;
90+
}
91+
92+
{
93+
ITest test = makeTest0();
94+
output[outputIdx] = test.getValue();
95+
expected[outputIdx++] = 0;
96+
}
97+
98+
{
99+
output[outputIdx] = makeTest0().getValue();
100+
expected[outputIdx++] = 0;
101+
}
102+
103+
output[outputIdx] = 1000;
104+
expected[outputIdx++] = 1000;
105+
106+
/// Test1
107+
{
108+
Test1 test;
109+
output[outputIdx] = test.getValue();
110+
expected[outputIdx++] = 1;
111+
}
112+
113+
{
114+
ITest test = Test1();
115+
output[outputIdx] = test.getValue();
116+
expected[outputIdx++] = 1;
117+
}
118+
119+
{
120+
output[outputIdx] = Test1().getValue();
121+
expected[outputIdx++] = 1;
122+
}
123+
124+
{
125+
ITest test = makeTest1();
126+
output[outputIdx] = test.getValue();
127+
expected[outputIdx++] = 1;
128+
}
129+
130+
{
131+
output[outputIdx] = makeTest1().getValue();
132+
expected[outputIdx++] = 1;
133+
}
134+
135+
output[outputIdx] = 2000;
136+
expected[outputIdx++] = 2000;
137+
138+
/// TestAny
139+
{
140+
TestAny test;
141+
output[outputIdx] = test.getValue();
142+
expected[outputIdx++] = 5;
143+
}
144+
145+
{
146+
ITest test = TestAny();
147+
output[outputIdx] = test.getValue();
148+
expected[outputIdx++] = 5;
149+
}
150+
151+
{
152+
ITest test = TestAny(2);
153+
output[outputIdx] = test.getValue();
154+
expected[outputIdx++] = 2;
155+
}
156+
157+
{
158+
output[outputIdx] = TestAny().getValue();
159+
expected[outputIdx++] = 5;
160+
}
161+
162+
{
163+
output[outputIdx] = TestAny(2).getValue();
164+
expected[outputIdx++] = 2;
165+
}
166+
167+
{
168+
ITest test = makeTestAny();
169+
output[outputIdx] = test.getValue();
170+
expected[outputIdx++] = 5;
171+
}
172+
173+
{
174+
ITest test = makeTestAny(2);
175+
output[outputIdx] = test.getValue();
176+
expected[outputIdx++] = 2;
177+
}
178+
179+
{
180+
output[outputIdx] = makeTestAny().getValue();
181+
expected[outputIdx++] = 5;
182+
}
183+
184+
{
185+
output[outputIdx] = makeTestAny(2).getValue();
186+
expected[outputIdx++] = 2;
187+
}
188+
189+
expected[outputIdx++] = uint(-1);
190+
}

0 commit comments

Comments
 (0)