From e588d23a91fd28cd4218995a33c2a46fe721ff62 Mon Sep 17 00:00:00 2001 From: Fangrui Song Date: Fri, 11 Nov 2022 22:59:51 -0800 Subject: [PATCH] Add back single quotes when dontcall attribute was split into dontcall-error/dontcall-warn Single quotes were accidentally dropped in D110364. --- .../include/clang/Basic/DiagnosticFrontendKinds.td | 4 ++-- .../backend-attribute-error-warning-optimize.c | 2 +- .../Frontend/backend-attribute-error-warning.c | 12 +++++------ .../Frontend/backend-attribute-error-warning.cpp | 24 +++++++++++----------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/clang/include/clang/Basic/DiagnosticFrontendKinds.td b/clang/include/clang/Basic/DiagnosticFrontendKinds.td index 1bd31ca..f0212ca 100644 --- a/clang/include/clang/Basic/DiagnosticFrontendKinds.td +++ b/clang/include/clang/Basic/DiagnosticFrontendKinds.td @@ -86,9 +86,9 @@ def err_fe_backend_unsupported : Error<"%0">, BackendInfo; def warn_fe_backend_unsupported : Warning<"%0">, BackendInfo; def err_fe_backend_error_attr : - Error<"call to %0 declared with 'error' attribute: %1">, BackendInfo; + Error<"call to '%0' declared with 'error' attribute: %1">, BackendInfo; def warn_fe_backend_warning_attr : - Warning<"call to %0 declared with 'warning' attribute: %1">, BackendInfo, + Warning<"call to '%0' declared with 'warning' attribute: %1">, BackendInfo, InGroup; def err_fe_invalid_code_complete_file : Error< diff --git a/clang/test/Frontend/backend-attribute-error-warning-optimize.c b/clang/test/Frontend/backend-attribute-error-warning-optimize.c index 668a0a4..d3951e3 100644 --- a/clang/test/Frontend/backend-attribute-error-warning-optimize.c +++ b/clang/test/Frontend/backend-attribute-error-warning-optimize.c @@ -8,7 +8,7 @@ int x(void) { return 8 % 2 == 1; } void baz(void) { - foo(); // expected-error {{call to foo declared with 'error' attribute: oh no foo}} + foo(); // expected-error {{call to 'foo' declared with 'error' attribute: oh no foo}} if (x()) bar(); } diff --git a/clang/test/Frontend/backend-attribute-error-warning.c b/clang/test/Frontend/backend-attribute-error-warning.c index a1450b4..c3c7803 100644 --- a/clang/test/Frontend/backend-attribute-error-warning.c +++ b/clang/test/Frontend/backend-attribute-error-warning.c @@ -22,12 +22,12 @@ void // expected-note@-1 {{previous a duplicate_warnings(void); void baz(void) { - foo(); // expected-error {{call to foo declared with 'error' attribute: oh no foo}} + foo(); // expected-error {{call to 'foo' declared with 'error' attribute: oh no foo}} if (x()) - bar(); // expected-error {{call to bar declared with 'error' attribute: oh no bar}} + bar(); // expected-error {{call to 'bar' declared with 'error' attribute: oh no bar}} - quux(); // enabled-warning {{call to quux declared with 'warning' attribute: oh no quux}} - __compiletime_assert_455(); // expected-error {{call to __compiletime_assert_455 declared with 'error' attribute: demangle me}} - duplicate_errors(); // expected-error {{call to duplicate_errors declared with 'error' attribute: two}} - duplicate_warnings(); // enabled-warning {{call to duplicate_warnings declared with 'warning' attribute: two}} + quux(); // enabled-warning {{call to 'quux' declared with 'warning' attribute: oh no quux}} + __compiletime_assert_455(); // expected-error {{call to '__compiletime_assert_455' declared with 'error' attribute: demangle me}} + duplicate_errors(); // expected-error {{call to 'duplicate_errors' declared with 'error' attribute: two}} + duplicate_warnings(); // enabled-warning {{call to 'duplicate_warnings' declared with 'warning' attribute: two}} } diff --git a/clang/test/Frontend/backend-attribute-error-warning.cpp b/clang/test/Frontend/backend-attribute-error-warning.cpp index 9e3fac8..1ed549c 100644 --- a/clang/test/Frontend/backend-attribute-error-warning.cpp +++ b/clang/test/Frontend/backend-attribute-error-warning.cpp @@ -23,14 +23,14 @@ void // expected-note@-1 {{previous a duplicate_warnings(void); void baz(void) { - foo(); // expected-error {{call to foo() declared with 'error' attribute: oh no foo}} + foo(); // expected-error {{call to 'foo()' declared with 'error' attribute: oh no foo}} if (x()) - bar(); // expected-error {{call to bar() declared with 'error' attribute: oh no bar}} + bar(); // expected-error {{call to 'bar()' declared with 'error' attribute: oh no bar}} - quux(); // enabled-warning {{call to quux() declared with 'warning' attribute: oh no quux}} - __compiletime_assert_455(); // expected-error {{call to __compiletime_assert_455() declared with 'error' attribute: demangle me}} - duplicate_errors(); // expected-error {{call to duplicate_errors() declared with 'error' attribute: two}} - duplicate_warnings(); // enabled-warning {{call to duplicate_warnings() declared with 'warning' attribute: two}} + quux(); // enabled-warning {{call to 'quux()' declared with 'warning' attribute: oh no quux}} + __compiletime_assert_455(); // expected-error {{call to '__compiletime_assert_455()' declared with 'error' attribute: demangle me}} + duplicate_errors(); // expected-error {{call to 'duplicate_errors()' declared with 'error' attribute: two}} + duplicate_warnings(); // enabled-warning {{call to 'duplicate_warnings()' declared with 'warning' attribute: two}} } #ifdef __cplusplus @@ -45,16 +45,16 @@ struct Widget { }; void baz_cpp(void) { - foo(); // expected-error {{call to foo() declared with 'error' attribute: oh no foo}} + foo(); // expected-error {{call to 'foo()' declared with 'error' attribute: oh no foo}} if (x()) - bar(); // expected-error {{call to bar() declared with 'error' attribute: oh no bar}} - quux(); // enabled-warning {{call to quux() declared with 'warning' attribute: oh no quux}} + bar(); // expected-error {{call to 'bar()' declared with 'error' attribute: oh no bar}} + quux(); // enabled-warning {{call to 'quux()' declared with 'warning' attribute: oh no quux}} // Test that we demangle correctly in the diagnostic for C++. - __compiletime_assert_455(); // expected-error {{call to __compiletime_assert_455() declared with 'error' attribute: demangle me}} - nocall(42); // expected-error {{call to int nocall(int) declared with 'error' attribute: demangle me, too}} + __compiletime_assert_455(); // expected-error {{call to '__compiletime_assert_455()' declared with 'error' attribute: demangle me}} + nocall(42); // expected-error {{call to 'int nocall(int)' declared with 'error' attribute: demangle me, too}} Widget W; - int w = W; // enabled-warning {{Widget::operator int() declared with 'warning' attribute: don't call me!}} + int w = W; // enabled-warning {{call to 'Widget::operator int()' declared with 'warning' attribute: don't call me!}} } #endif -- 2.7.4