On Monday, February 16, 2015, Aaron Ballman <<a href="mailto:aaron@aaronballman.com">aaron@aaronballman.com</a>> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: aaronballman<br>
Date: Mon Feb 16 17:12:37 2015<br>
New Revision: 229454<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=229454&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=229454&view=rev</a><br>
Log:<br>
Minor tweaks to r229447 to ensure the attribute is properly quoted when diagnosed.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
cfe/trunk/lib/Sema/SemaDeclAttr.cpp<br>
cfe/trunk/test/Parser/cxx0x-attributes.cpp<br>
cfe/trunk/test/SemaCXX/for-range-examples.cpp<br>
cfe/trunk/test/SemaCXX/generalized-deprecated.cpp<br>
<br>
Modified: cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=229454&r1=229453&r2=229454&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td?rev=229454&r1=229453&r2=229454&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td (original)<br>
+++ cfe/trunk/include/clang/Basic/DiagnosticSemaKinds.td Mon Feb 16 17:12:37 2015<br>
@@ -7233,9 +7233,8 @@ def err_asm_naked_this_ref : Error<<br>
def err_asm_naked_parm_ref : Error<<br>
"parameter references not allowed in naked functions">;<br>
<br>
-def ext_use_of_attribute_is_a_cxx14_extension<br>
- : ExtWarn<"use of the %0 attribute is a C++14 extension">,<br>
- InGroup<CXX14>;<br>
+def ext_use_of_attribute_is_a_cxx14_extension : ExtWarn<<br>
+ "use of the %0 attribute is a C++14 extension">, InGroup<CXX14>;</blockquote><div><br></div><div>The original formatting was the result of clang-format. Is that not preferable?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
// OpenCL warnings and errors.<br>
def err_invalid_astype_of_different_size : Error<<br>
<br>
Modified: cfe/trunk/lib/Sema/SemaDeclAttr.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=229454&r1=229453&r2=229454&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDeclAttr.cpp?rev=229454&r1=229453&r2=229454&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/lib/Sema/SemaDeclAttr.cpp (original)<br>
+++ cfe/trunk/lib/Sema/SemaDeclAttr.cpp Mon Feb 16 17:12:37 2015<br>
@@ -4259,7 +4259,7 @@ static void handleDeprecatedAttr(Sema &S<br>
if (Attr.isCXX11Attribute() &&<br>
!(Attr.hasScope() && Attr.getScopeName()->isStr("gnu")))<br>
S.Diag(Attr.getLoc(), diag::ext_use_of_attribute_is_a_cxx14_extension)<br>
- << Attr.getName()->getNameStart();<br>
+ << Attr.getName();<br>
<br>
handleAttrWithMessage<DeprecatedAttr>(S, D, Attr);<br>
}<br>
<br>
Modified: cfe/trunk/test/Parser/cxx0x-attributes.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx0x-attributes.cpp?rev=229454&r1=229453&r2=229454&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/cxx0x-attributes.cpp?rev=229454&r1=229453&r2=229454&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/Parser/cxx0x-attributes.cpp (original)<br>
+++ cfe/trunk/test/Parser/cxx0x-attributes.cpp Mon Feb 16 17:12:37 2015<br>
@@ -288,7 +288,7 @@ namespace arguments {<br>
void f[[gnu::format(printf, 1, 2)]](const char*, ...);<br>
void g() [[unknown::foo(ignore arguments for unknown attributes, even with symbols!)]]; // expected-warning {{unknown attribute 'foo' ignored}}<br>
[[deprecated("with argument")]] int i;<br>
- // expected-warning@-1 {{use of the deprecated attribute is a C++14 extension}}<br>
+ // expected-warning@-1 {{use of the 'deprecated' attribute is a C++14 extension}}<br>
}<br>
<br>
// Forbid attributes on decl specifiers.<br>
@@ -331,12 +331,12 @@ namespace GccASan {<br>
<br>
namespace {<br>
[[deprecated]] void bar();<br>
- // expected-warning@-1 {{use of the deprecated attribute is a C++14 extension}}<br>
+ // expected-warning@-1 {{use of the 'deprecated' attribute is a C++14 extension}}<br>
[[deprecated("hello")]] void baz();<br>
- // expected-warning@-1 {{use of the deprecated attribute is a C++14 extension}}<br>
+ // expected-warning@-1 {{use of the 'deprecated' attribute is a C++14 extension}}<br>
[[deprecated()]] void foo();<br>
// expected-error@-1 {{parentheses must be omitted if 'deprecated' attribute's argument list is empty}}<br>
- // expected-warning@-2 {{use of the deprecated attribute is a C++14 extension}}<br>
+ // expected-warning@-2 {{use of the 'deprecated' attribute is a C++14 extension}}<br>
[[gnu::deprecated()]] void quux();<br>
}<br>
<br>
<br>
Modified: cfe/trunk/test/SemaCXX/for-range-examples.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/for-range-examples.cpp?rev=229454&r1=229453&r2=229454&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/for-range-examples.cpp?rev=229454&r1=229453&r2=229454&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/for-range-examples.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/for-range-examples.cpp Mon Feb 16 17:12:37 2015<br>
@@ -1,4 +1,4 @@<br>
-// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++11<br>
+// RUN: %clang_cc1 -fsyntax-only -verify %s -std=c++11<br>
<br>
namespace value_range_detail {<br>
template<typename T><br>
@@ -226,7 +226,7 @@ namespace test7 {<br>
// we check the alignment attribute before we perform the auto<br>
// deduction.<br>
for (d alignas(1) : arr) {} // expected-error {{requires type for loop variable}}<br>
- for (e [[deprecated]] : arr) { e = 0; } // expected-warning{{use of the deprecated attribute is a C++14 extension}} expected-warning {{deprecated}} expected-note {{here}} expected-error {{requires type for loop variable}}<br>
+ for (e [[deprecated]] : arr) { e = 0; } // expected-warning{{use of the 'deprecated' attribute is a C++14 extension}} expected-warning {{deprecated}} expected-note {{here}} expected-error {{requires type for loop variable}}<br>
}<br>
}<br>
<br>
<br>
Modified: cfe/trunk/test/SemaCXX/generalized-deprecated.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/generalized-deprecated.cpp?rev=229454&r1=229453&r2=229454&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/generalized-deprecated.cpp?rev=229454&r1=229453&r2=229454&view=diff</a><br>
==============================================================================<br>
--- cfe/trunk/test/SemaCXX/generalized-deprecated.cpp (original)<br>
+++ cfe/trunk/test/SemaCXX/generalized-deprecated.cpp Mon Feb 16 17:12:37 2015<br>
@@ -4,7 +4,7 @@<br>
// warnings<br>
<br>
[[deprecated("1")]] int function_1();<br>
-// expected-warning@-1 {{use of the deprecated attribute is a C++14 extension}}<br>
+// expected-warning@-1 {{use of the 'deprecated' attribute is a C++14 extension}}<br>
<br>
[[gnu::deprecated("3")]] int function_3();<br>
<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="javascript:;" onclick="_e(event, 'cvml', 'cfe-commits@cs.uiuc.edu')">cfe-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits</a><br>
</blockquote><br><br>-- <br>Saleem Abdulrasool<br>compnerd (at) compnerd (dot) org<br>