<div dir="ltr">Not sure it adds that much value, but done in r222755.</div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, Nov 25, 2014 at 12:38 PM, Alexander Kornienko <span dir="ltr"><<a href="mailto:alexfh@google.com" target="_blank">alexfh@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr"><br><div class="gmail_extra"><br><div class="gmail_quote"><div><div class="h5">On Tue, Nov 25, 2014 at 11:45 AM, Daniel Jasper <span dir="ltr"><<a href="mailto:djasper@google.com" target="_blank">djasper@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: djasper<br>
Date: Tue Nov 25 04:45:23 2014<br>
New Revision: 222751<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=222751&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=222751&view=rev</a><br>
Log:<br>
clang-tidy: Add override before the first attribute.<br>
<br>
Apparently attributes aren't sorted by source location.<br>
<br>
Modified:<br>
clang-tools-extra/trunk/clang-tidy/misc/UseOverride.cpp<br>
clang-tools-extra/trunk/test/clang-tidy/misc-use-override.cpp<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/misc/UseOverride.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/UseOverride.cpp?rev=222751&r1=222750&r2=222751&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/UseOverride.cpp?rev=222751&r1=222750&r2=222751&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/misc/UseOverride.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/misc/UseOverride.cpp Tue Nov 25 04:45:23 2014<br>
@@ -98,8 +98,10 @@ void UseOverride::check(const MatchFinde<br>
if (Method->hasAttrs()) {<br>
for (const clang::Attr *A : Method->getAttrs()) {<br>
if (!A->isImplicit()) {<br>
- InsertLoc = Sources.getExpansionLoc(A->getLocation());<br>
- break;<br>
+ SourceLocation Loc = Sources.getExpansionLoc(A->getLocation());<br>
+ if (!InsertLoc.isValid() ||<br>
+ Sources.isBeforeInTranslationUnit(Loc, InsertLoc))<br>
+ InsertLoc = Loc;<br>
}<br>
}<br>
}<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-tidy/misc-use-override.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/misc-use-override.cpp?rev=222751&r1=222750&r2=222751&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/misc-use-override.cpp?rev=222751&r1=222750&r2=222751&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-tidy/misc-use-override.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-tidy/misc-use-override.cpp Tue Nov 25 04:45:23 2014<br>
@@ -9,6 +9,7 @@<br>
#define NOT_OVERRIDE<br>
<br>
#define MUST_USE_RESULT __attribute__((warn_unused_result))<br>
+#define UNUSED __attribute__((unused))<br>
<br>
struct MUST_USE_RESULT MustUseResultObject {};<br>
<br>
@@ -24,7 +25,7 @@ struct Base {<br>
<br>
virtual void j() const;<br>
virtual MustUseResultObject k();<br>
- virtual bool l() MUST_USE_RESULT;<br>
+ virtual bool l() MUST_USE_RESULT UNUSED;<br></blockquote><div><br></div></div></div><div>Maybe add a test with the reversed order of attributes?</div><div><div class="h5"><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
virtual void m();<br>
};<br>
@@ -71,9 +72,9 @@ public:<br>
// CHECK-MESSAGES: :[[@LINE-1]]:31: warning: Prefer using<br>
// CHECK-FIXES: {{^ MustUseResultObject k\(\) override;}}<br>
<br>
- virtual bool l() MUST_USE_RESULT; // Has an explicit attribute<br>
+ virtual bool l() MUST_USE_RESULT UNUSED;<br>
// CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Prefer using<br>
- // CHECK-FIXES: {{^ bool l\(\) override MUST_USE_RESULT;}}<br>
+ // CHECK-FIXES: {{^ bool l\(\) override MUST_USE_RESULT UNUSED;}}<br>
<br>
virtual void m() override final;<br>
// CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this<br>
@@ -117,9 +118,9 @@ public:<br>
// CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this<br>
// CHECK-FIXES: {{^ void j\(\) const final;}}<br>
<br>
- virtual bool l() final MUST_USE_RESULT;<br>
+ virtual bool l() final MUST_USE_RESULT UNUSED;<br>
// CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Annotate this<br>
- // CHECK-FIXES: {{^ bool l\(\) final MUST_USE_RESULT;}}<br>
+ // CHECK-FIXES: {{^ bool l\(\) final MUST_USE_RESULT UNUSED;}}<br>
};<br>
<br>
struct InlineDefinitions : public Base {<br>
@@ -152,9 +153,9 @@ public:<br>
// CHECK-MESSAGES: :[[@LINE-1]]:31: warning: Prefer using<br>
// CHECK-FIXES: {{^ MustUseResultObject k\(\) override {}}}<br>
<br>
- virtual bool l() MUST_USE_RESULT {} // Has an explicit attribute<br>
+ virtual bool l() MUST_USE_RESULT UNUSED {}<br>
// CHECK-MESSAGES: :[[@LINE-1]]:16: warning: Prefer using<br>
- // CHECK-FIXES: {{^ bool l\(\) override MUST_USE_RESULT {}}}<br>
+ // CHECK-FIXES: {{^ bool l\(\) override MUST_USE_RESULT UNUSED {}}}<br>
};<br>
<br>
struct Macros : public Base {<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@cs.uiuc.edu" target="_blank">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></div></div></div><span class="HOEnZb"><font color="#888888"><br><br clear="all"><div><br></div>-- <br><div><div dir="ltr"><div><div><font color="#666666"><span style="border-top-width:2px;border-right-width:0px;border-bottom-width:0px;border-left-width:0px;border-top-style:solid;border-right-style:solid;border-bottom-style:solid;border-left-style:solid;border-top-color:rgb(213,15,37);border-right-color:rgb(213,15,37);border-bottom-color:rgb(213,15,37);border-left-color:rgb(213,15,37);padding-top:2px;margin-top:2px">Alexander Kornienko |</span><span style="border-top-width:2px;border-right-width:0px;border-bottom-width:0px;border-left-width:0px;border-top-style:solid;border-right-style:solid;border-bottom-style:solid;border-left-style:solid;border-top-color:rgb(51,105,232);border-right-color:rgb(51,105,232);border-bottom-color:rgb(51,105,232);border-left-color:rgb(51,105,232);padding-top:2px;margin-top:2px"> Software Engineer |</span></font><span style="border-top-width:2px;border-right-width:0px;border-bottom-width:0px;border-left-width:0px;border-top-style:solid;border-right-style:solid;border-bottom-style:solid;border-left-style:solid;border-top-color:rgb(0,153,57);border-right-color:rgb(0,153,57);border-bottom-color:rgb(0,153,57);border-left-color:rgb(0,153,57);padding-top:2px;margin-top:2px"><font color="#666666"> </font><a href="mailto:alexfh@google.com" style="color:rgb(17,85,204)" target="_blank">alexfh@google.com</a> |</span><span style="border-top-width:2px;border-right-width:0px;border-bottom-width:0px;border-left-width:0px;border-top-style:solid;border-right-style:solid;border-bottom-style:solid;border-left-style:solid;border-top-color:rgb(238,178,17);border-right-color:rgb(238,178,17);border-bottom-color:rgb(238,178,17);border-left-color:rgb(238,178,17);padding-top:2px;margin-top:2px"> Google Germany, Munich</span></div></div></div></div>
</font></span></div></div>
</blockquote></div><br></div>