From 3fe4a77287345c303aeb985e24ee237f272e8eca Mon Sep 17 00:00:00 2001 From: Yong He Date: Tue, 11 Jun 2024 23:58:25 -0700 Subject: Fix crash when using optional type in a generic. (#4341) --- tests/bugs/optional-generic.slang | 22 ++++++++++++++++++++ tests/bugs/optional.slang | 42 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 tests/bugs/optional-generic.slang create mode 100644 tests/bugs/optional.slang (limited to 'tests') diff --git a/tests/bugs/optional-generic.slang b/tests/bugs/optional-generic.slang new file mode 100644 index 000000000..16b466273 --- /dev/null +++ b/tests/bugs/optional-generic.slang @@ -0,0 +1,22 @@ +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -compute +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -compute -vk + + +Optional genFunc(T v) +{ + if (v is int) + return v; + return none; +} + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name buffer + +RWStructuredBuffer buffer; + +[numthreads(1,1,1)] +void computeMain() +{ + // BUF: 2 + buffer[0] = genFunc(2).value; +} + diff --git a/tests/bugs/optional.slang b/tests/bugs/optional.slang new file mode 100644 index 000000000..3512ba29f --- /dev/null +++ b/tests/bugs/optional.slang @@ -0,0 +1,42 @@ +//TEST(compute):COMPARE_COMPUTE_EX(filecheck-buffer=BUF):-slang -compute +//TEST(compute):COMPARE_COMPUTE(filecheck-buffer=BUF):-slang -compute -vk + +interface IFoo +{ + void foo(); +} + +struct S : IFoo { int x; void foo(); } + +struct P +{ + IFoo f; +} +struct Tr +{ + int test(T t, inout P p) + { + const IFoo hit = p.f; + let castResult = hit as S; + if (!castResult.hasValue) + return 0; + return castResult.value.x; + } +} + +//TEST_INPUT:ubuffer(data=[0 0 0 0], stride=4):out,name buffer + +RWStructuredBuffer buffer; + +[numthreads(1,1,1)] +void computeMain() +{ + P p; + S s; + s.x = 2; + p.f = s; + Tr tt; + // BUF: 2 + buffer[0] = tt.test(0, p); +} + -- cgit v1.2.3