From 90c34e3db4fdc7be79c62bd91905a2a84bbd673e Mon Sep 17 00:00:00 2001 From: Yong He Date: Thu, 10 Jul 2025 21:14:16 -0700 Subject: Ensure generic constraints are checked before inner extension. (#7685) * Ensure generic constraints are checked before inner extension. * Add warning for non-standard generic extension. * Fix tests. * Fix test. * Ban interface types from equality constraints. * Fix. --- .../extensions/generic-extension-2.slang | 2 + .../extensions/generic-extension-5.slang | 52 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) create mode 100644 tests/language-feature/extensions/generic-extension-5.slang (limited to 'tests/language-feature/extensions') diff --git a/tests/language-feature/extensions/generic-extension-2.slang b/tests/language-feature/extensions/generic-extension-2.slang index 2728a73d6..d56455e3d 100644 --- a/tests/language-feature/extensions/generic-extension-2.slang +++ b/tests/language-feature/extensions/generic-extension-2.slang @@ -1,4 +1,6 @@ //TEST(compute):COMPARE_COMPUTE(filecheck-buffer=CHECK): -shaderobj + +#pragma warning(disable:30856) interface IFoo { T getFirst(); diff --git a/tests/language-feature/extensions/generic-extension-5.slang b/tests/language-feature/extensions/generic-extension-5.slang new file mode 100644 index 000000000..e6466d614 --- /dev/null +++ b/tests/language-feature/extensions/generic-extension-5.slang @@ -0,0 +1,52 @@ +//TEST:INTERPRET(filecheck=CHECK): +interface IGen +{ + associatedtype TB; + TB getVal(); +} + +struct Foo1 : IGen +{ + typealias TB = int; + int val = 0; + TB getVal() + { + return val; + } +} + +struct Foo2 : IGen +{ + typealias TB = int; + int val = 0; + TB getVal() + { + return val; + } +} + +struct Logic, C2 : IGen> +{ + int val = 0; +} + +extension Logic + where C1 : IGen + where C2 : IGen + where C1.TB == C2.TB +{ + [mutating] + void setVal(int dataIn) + { + val = dataIn; + } +} + +void main() +{ + Logic, Foo2> logic; + logic.setVal(42); + int result = logic.val; + printf("Result: %d\n", result); + // CHECK: Result: 42 +} \ No newline at end of file -- cgit v1.2.3