Fix #5354, change diagnostic definition error message and expect outp…

…ut in test (#6067) Co-authored-by: Yong He <yonghe@outlook.com>
shader-slang · Jan 14, 2025 · 971996b · 971996b
1 parent d98e3f3
commit 971996b
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/source/slang/slang-diagnostic-defs.h b/source/slang/slang-diagnostic-defs.h
@@ -2060,7 +2060,7 @@ DIAGNOSTIC(
 DIAGNOSTIC(41000, Warning, unreachableCode, "unreachable code detected")
 DIAGNOSTIC(41001, Error, recursiveType, "type '$0' contains cyclic reference to itself.")
 
-DIAGNOSTIC(41010, Warning, missingReturn, "control flow may reach end of non-'void' function")
+DIAGNOSTIC(41010, Warning, missingReturn, "non-void function does not return in all cases")
 DIAGNOSTIC(
     41011,
     Error,

diff --git a/tests/diagnostics/missing-return.slang.expected b/tests/diagnostics/missing-return.slang.expected
@@ -1,9 +1,9 @@
 result code = 0
 standard error = {
-tests/diagnostics/missing-return.slang(7): warning 41010: control flow may reach end of non-'void' function
+tests/diagnostics/missing-return.slang(7): warning 41010: non-void function does not return in all cases
 int bad(int a, int b)
     ^~~
-tests/diagnostics/missing-return.slang(14): warning 41010: control flow may reach end of non-'void' function
+tests/diagnostics/missing-return.slang(14): warning 41010: non-void function does not return in all cases
 int alsoBad(int a, int b)
     ^~~~~~~
 }