Author: Justin Bogner Date: 2023-08-25T01:03:22-07:00 New Revision: ea32f9948023ef168f6ea8f61c33c268f153a0ce
URL: https://github.com/llvm/llvm-project/commit/ea32f9948023ef168f6ea8f61c33c268f153a0ce DIFF: https://github.com/llvm/llvm-project/commit/ea32f9948023ef168f6ea8f61c33c268f153a0ce.diff LOG: [Sema][HLSL] Clarify wording. NFC Added: Modified: clang/include/clang/Basic/DiagnosticSemaKinds.td clang/test/SemaHLSL/entry_shader.hlsl Removed: ################################################################################ diff --git a/clang/include/clang/Basic/DiagnosticSemaKinds.td b/clang/include/clang/Basic/DiagnosticSemaKinds.td index 8c629aad89f48a..cf6f422ee47167 100644 --- a/clang/include/clang/Basic/DiagnosticSemaKinds.td +++ b/clang/include/clang/Basic/DiagnosticSemaKinds.td @@ -11870,7 +11870,7 @@ def err_hlsl_attr_invalid_type : Error< def err_hlsl_attr_invalid_ast_node : Error< "attribute %0 only applies to %1">; def err_hlsl_entry_shader_attr_mismatch : Error< - "%0 attribute on entry function does not match the pipeline stage">; + "%0 attribute on entry function does not match the target profile">; def err_hlsl_numthreads_argument_oor : Error<"argument '%select{X|Y|Z}0' to numthreads attribute cannot exceed %1">; def err_hlsl_numthreads_invalid : Error<"total number of threads cannot exceed %0">; def err_hlsl_missing_numthreads : Error<"missing numthreads attribute for %0 shader entry">; diff --git a/clang/test/SemaHLSL/entry_shader.hlsl b/clang/test/SemaHLSL/entry_shader.hlsl index a47e2563e0d1a7..75279f5e562d70 100644 --- a/clang/test/SemaHLSL/entry_shader.hlsl +++ b/clang/test/SemaHLSL/entry_shader.hlsl @@ -1,7 +1,7 @@ // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -hlsl-entry foo -o - %s -DSHADER='"anyHit"' -verify // RUN: %clang_cc1 -triple dxil-pc-shadermodel6.3-compute -x hlsl -hlsl-entry foo -o - %s -DSHADER='"compute"' -// expected-error@+1 {{'shader' attribute on entry function does not match the pipeline stage}} +// expected-error@+1 {{'shader' attribute on entry function does not match the target profile}} [numthreads(1,1,1), shader(SHADER)] void foo() { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
