diff options
| author | Yong He <yonghe@outlook.com> | 2023-08-10 13:19:37 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-08-10 13:19:37 -0700 |
| commit | 60ebadab1ec269c7017148a028307a9b5f32b1d4 (patch) | |
| tree | d6e02ae04c06f4fb433eb36df1f40e0a9c97ab07 | |
| parent | d4e72a93e13ab880b2f355fb7fb5d55cf0113c3d (diff) | |
Allow member lookup through modified type. (#3091)
* Allow member lookup through modified type.
* Disable `lockFileSync` test.
---------
Co-authored-by: Yong He <yhe@nvidia.com>
| -rw-r--r-- | source/slang/slang-check-expr.cpp | 7 | ||||
| -rw-r--r-- | tests/bugs/gh-3086.slang | 11 | ||||
| -rw-r--r-- | tools/slang-unit-test/unit-test-lock-file.cpp | 4 |
3 files changed, 19 insertions, 3 deletions
diff --git a/source/slang/slang-check-expr.cpp b/source/slang/slang-check-expr.cpp index e343e3113..05cb6262b 100644 --- a/source/slang/slang-check-expr.cpp +++ b/source/slang/slang-check-expr.cpp @@ -3574,7 +3574,12 @@ namespace Slang Expr* SemanticsExprVisitor::visitMemberExpr(MemberExpr * expr) { expr->baseExpression = checkBaseForMemberExpr(expr->baseExpression); - auto & baseType = expr->baseExpression->type; + auto baseType = expr->baseExpression->type; + + // If we are looking up through a modified type, just pass straight + // through the inner type. + if (auto modifiedType = as<ModifiedType>(baseType)) + baseType = modifiedType->getBase(); // Note: Checking for vector types before declaration-reference types, // because vectors are also declaration reference types... diff --git a/tests/bugs/gh-3086.slang b/tests/bugs/gh-3086.slang new file mode 100644 index 000000000..a4e9025c4 --- /dev/null +++ b/tests/bugs/gh-3086.slang @@ -0,0 +1,11 @@ +//TEST:SIMPLE(filecheck=CHECK): -entry MainCs -stage compute -profile glsl_450 -target spirv +//CHECK: EntryPoint + +[vk::image_format("rgba8")] +RWTexture2D < unorm float4 > DstColor ; + +[ numthreads ( 64 , 1 , 1 ) ] +void MainCs ( uint3 Gid : SV_GroupID , uint GI : SV_GroupIndex , uint3 GTid : SV_GroupThreadID , uint3 DTid : SV_DispatchThreadID ) +{ + DstColor [ 0 ] = float4 ( lerp ( DstColor [ 0 ].rgb, float3( 0, 0, 0 ), 1.0 ) , 1.0f ) ; +} diff --git a/tools/slang-unit-test/unit-test-lock-file.cpp b/tools/slang-unit-test/unit-test-lock-file.cpp index 312d9a1e2..be767a5ee 100644 --- a/tools/slang-unit-test/unit-test-lock-file.cpp +++ b/tools/slang-unit-test/unit-test-lock-file.cpp @@ -29,9 +29,9 @@ SLANG_UNIT_TEST(lockFileOpenClose) SLANG_UNIT_TEST(lockFileSync) { - // aarch64 builds currently fail to run multi-threaded tests within the test-server. + // aarch64/linux builds currently fail to run multi-threaded tests within the test-server. // Tests work fine without the test-server, which is puzzling. For now we disable them. -#if SLANG_PROCESSOR_ARM_64 +#if SLANG_PROCESSOR_ARM_64 || SLANG_LINUX SLANG_IGNORE_TEST #endif |