<div dir="ltr">Thanks!</div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Apr 7, 2016 at 4:55 PM, Benjamin Kramer via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: d0k<br>
Date: Thu Apr 7 09:55:25 2016<br>
New Revision: 265680<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=265680&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project?rev=265680&view=rev</a><br>
Log:<br>
[clang-tidy] Remove unnecessary getName() on Decls and Types feeding into a DiagnosticBuilder<br>
<br>
Going through a string removes some of the smarts of the diagnosic printer<br>
and makes the code more complicated. This change has some cosmetic impact<br>
on the output but that's mostly minor.<br>
<br>
Modified:<br>
clang-tools-extra/trunk/clang-tidy/google/NonConstReferences.cpp<br>
clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/misc/NonCopyableObjects.cpp<br>
clang-tools-extra/trunk/clang-tidy/misc/UnusedAliasDeclsCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/misc/UnusedParametersCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/performance/FasterStringFindCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/performance/ImplicitCastInLoopCheck.cpp<br>
clang-tools-extra/trunk/clang-tidy/readability/FunctionSizeCheck.cpp<br>
clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp<br>
clang-tools-extra/trunk/test/clang-tidy/performance-faster-string-find.cpp<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/google/NonConstReferences.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/NonConstReferences.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/google/NonConstReferences.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/google/NonConstReferences.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/google/NonConstReferences.cpp Thu Apr 7 09:55:25 2016<br>
@@ -115,8 +115,8 @@ void NonConstReferences::check(const Mat<br>
<< Parameter->getFunctionScopeIndex();<br>
} else {<br>
diag(Parameter->getLocation(),<br>
- "non-const reference parameter '%0', make it const or use a pointer")<br>
- << Parameter->getName();<br>
+ "non-const reference parameter %0, make it const or use a pointer")<br>
+ << Parameter;<br>
}<br>
}<br>
<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/misc/DefinitionsInHeadersCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -118,11 +118,10 @@ void DefinitionsInHeadersCheck::check(co<br>
}<br>
<br>
diag(FD->getLocation(),<br>
- "function '%0' defined in a header file; "<br>
+ "function %0 defined in a header file; "<br>
"function definitions in header files can lead to ODR violations")<br>
- << FD->getNameInfo().getName().getAsString()<br>
- << FixItHint::CreateInsertion(FD->getSourceRange().getBegin(),<br>
- "inline ");<br>
+ << FD << FixItHint::CreateInsertion(FD->getSourceRange().getBegin(),<br>
+ "inline ");<br>
} else if (const auto *VD = dyn_cast<VarDecl>(ND)) {<br>
// Static data members of a class template are allowed.<br>
if (VD->getDeclContext()->isDependentContext() && VD->isStaticDataMember())<br>
@@ -134,9 +133,9 @@ void DefinitionsInHeadersCheck::check(co<br>
return;<br>
<br>
diag(VD->getLocation(),<br>
- "variable '%0' defined in a header file; "<br>
+ "variable %0 defined in a header file; "<br>
"variable definitions in header files can lead to ODR violations")<br>
- << VD->getName();<br>
+ << VD;<br>
}<br>
}<br>
<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/misc/ForwardDeclarationNamespaceCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -139,12 +139,12 @@ void ForwardDeclarationNamespaceCheck::o<br>
if (!CurDecl->hasDefinition() &&<br>
!haveSameNamespaceOrTranslationUnit(CurDecl, Decl)) {<br>
diag(CurDecl->getLocation(),<br>
- "declaration '%0' is never referenced, but a declaration with "<br>
+ "declaration %0 is never referenced, but a declaration with "<br>
"the same name found in another namespace '%1'")<br>
- << CurDecl->getName() << getNameOfNamespace(Decl);<br>
- diag(Decl->getLocation(), "a declaration of '%0' is found here",<br>
+ << CurDecl << getNameOfNamespace(Decl);<br>
+ diag(Decl->getLocation(), "a declaration of %0 is found here",<br>
DiagnosticIDs::Note)<br>
- << Decl->getName();<br>
+ << Decl;<br>
break; // FIXME: We only generate one warning for each declaration.<br>
}<br>
}<br>
@@ -158,12 +158,12 @@ void ForwardDeclarationNamespaceCheck::o<br>
const auto &Definitions = DeclNameToDefinitions[DeclName];<br>
for (const auto *Def : Definitions) {<br>
diag(CurDecl->getLocation(),<br>
- "no definition found for '%0', but a definition with "<br>
- "the same name '%1' found in another namespace '%2'")<br>
- << CurDecl->getName() << Def->getName() << getNameOfNamespace(Def);<br>
- diag(Def->getLocation(), "a definition of '%0' is found here",<br>
+ "no definition found for %0, but a definition with "<br>
+ "the same name %1 found in another namespace '%2'")<br>
+ << CurDecl << Def << getNameOfNamespace(Def);<br>
+ diag(Def->getLocation(), "a definition of %0 is found here",<br>
DiagnosticIDs::Note)<br>
- << Def->getName();<br>
+ << Def;<br>
}<br>
}<br>
}<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/misc/MacroRepeatedSideEffectsCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -65,9 +65,9 @@ void MacroRepeatedPPCallbacks::MacroExpa<br>
if (hasSideEffects(ResultArgToks) &&<br>
countArgumentExpansions(MI, Arg) >= 2) {<br>
Check.diag(ResultArgToks->getLocation(),<br>
- "side effects in the %ordinal0 macro argument '%1' are "<br>
+ "side effects in the %ordinal0 macro argument %1 are "<br>
"repeated in macro expansion")<br>
- << (ArgNo + 1) << Arg->getName();<br>
+ << (ArgNo + 1) << Arg;<br>
Check.diag(MI->getDefinitionLoc(), "macro %0 defined here",<br>
DiagnosticIDs::Note)<br>
<< MacroNameTok.getIdentifierInfo();<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/misc/NonCopyableObjects.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/NonCopyableObjects.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/NonCopyableObjects.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/misc/NonCopyableObjects.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/misc/NonCopyableObjects.cpp Thu Apr 7 09:55:25 2016<br>
@@ -81,14 +81,14 @@ void NonCopyableObjectsCheck::check(cons<br>
const auto *E = Result.Nodes.getNodeAs<Expr>("expr");<br>
<br>
if (D && BD)<br>
- diag(D->getLocation(), "'%0' declared as type '%1', which is unsafe to copy"<br>
- "; did you mean '%1 *'?")<br>
- << D->getName() << BD->getName();<br>
+ diag(D->getLocation(), "%0 declared as type '%1', which is unsafe to copy"<br>
+ "; did you mean '%1 *'?")<br>
+ << D << BD->getName();<br>
else if (E)<br>
diag(E->getExprLoc(),<br>
- "expression has opaque data structure type '%0'; type should only be "<br>
+ "expression has opaque data structure type %0; type should only be "<br>
"used as a pointer and not dereferenced")<br>
- << BD->getName();<br>
+ << BD;<br>
}<br>
<br>
} // namespace tidy<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/misc/UnusedAliasDeclsCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/UnusedAliasDeclsCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/UnusedAliasDeclsCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/misc/UnusedAliasDeclsCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/misc/UnusedAliasDeclsCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -53,9 +53,8 @@ void UnusedAliasDeclsCheck::onEndOfTrans<br>
for (const auto &FoundDecl : FoundDecls) {<br>
if (!FoundDecl.second.isValid())<br>
continue;<br>
- diag(FoundDecl.first->getLocation(), "namespace alias decl '%0' is unused")<br>
- << FoundDecl.first->getName()<br>
- << FixItHint::CreateRemoval(FoundDecl.second);<br>
+ diag(FoundDecl.first->getLocation(), "namespace alias decl %0 is unused")<br>
+ << FoundDecl.first << FixItHint::CreateRemoval(FoundDecl.second);<br>
}<br>
}<br>
<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/misc/UnusedParametersCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/UnusedParametersCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/misc/UnusedParametersCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/misc/UnusedParametersCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/misc/UnusedParametersCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -67,8 +67,7 @@ void UnusedParametersCheck::warnOnUnused<br>
const MatchFinder::MatchResult &Result, const FunctionDecl *Function,<br>
unsigned ParamIndex) {<br>
const auto *Param = Function->getParamDecl(ParamIndex);<br>
- auto MyDiag = diag(Param->getLocation(), "parameter '%0' is unused")<br>
- << Param->getName();<br>
+ auto MyDiag = diag(Param->getLocation(), "parameter %0 is unused") << Param;<br>
<br>
auto DeclRefExpr =<br>
declRefExpr(to(equalsNode(Function)),<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/performance/FasterStringFindCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/performance/FasterStringFindCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/performance/FasterStringFindCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/performance/FasterStringFindCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/performance/FasterStringFindCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -116,11 +116,10 @@ void FasterStringFindCheck::check(const<br>
diag(Literal->getLocStart(), "%0 called with a string literal consisting of "<br>
"a single character; consider using the more "<br>
"effective overload accepting a character")<br>
- << FindFunc->getName()<br>
- << FixItHint::CreateReplacement(<br>
- CharSourceRange::getTokenRange(Literal->getLocStart(),<br>
- Literal->getLocEnd()),<br>
- *Replacement);<br>
+ << FindFunc << FixItHint::CreateReplacement(<br>
+ CharSourceRange::getTokenRange(Literal->getLocStart(),<br>
+ Literal->getLocEnd()),<br>
+ *Replacement);<br>
}<br>
<br>
} // namespace performance<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/performance/ImplicitCastInLoopCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/performance/ImplicitCastInLoopCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/performance/ImplicitCastInLoopCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/performance/ImplicitCastInLoopCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/performance/ImplicitCastInLoopCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -85,16 +85,12 @@ void ImplicitCastInLoopCheck::ReportAndF<br>
QualType ConstType = OperatorCall->getType().withConst();<br>
QualType ConstRefType = Context->getLValueReferenceType(ConstType);<br>
const char Message[] =<br>
- "the type of the loop variable '%0' is different from the one returned "<br>
+ "the type of the loop variable %0 is different from the one returned "<br>
"by the iterator and generates an implicit cast; you can either "<br>
- "change the type to the correct one ('%1' but 'const auto&' is always a "<br>
+ "change the type to the correct one (%1 but 'const auto&' is always a "<br>
"valid option) or remove the reference to make it explicit that you are "<br>
"creating a new value";<br>
- PrintingPolicy Policy(Context->getLangOpts());<br>
- Policy.SuppressTagKeyword = true;<br>
-<br>
- diag(VD->getLocStart(), Message) << VD->getName()<br>
- << ConstRefType.getAsString(Policy);<br>
+ diag(VD->getLocStart(), Message) << VD << ConstRefType;<br>
}<br>
<br>
} // namespace performance<br>
<br>
Modified: clang-tools-extra/trunk/clang-tidy/readability/FunctionSizeCheck.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/readability/FunctionSizeCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/readability/FunctionSizeCheck.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/clang-tidy/readability/FunctionSizeCheck.cpp (original)<br>
+++ clang-tools-extra/trunk/clang-tidy/readability/FunctionSizeCheck.cpp Thu Apr 7 09:55:25 2016<br>
@@ -74,8 +74,8 @@ void FunctionSizeCheck::onEndOfTranslati<br>
if (FI.Lines > LineThreshold || FI.Statements > StatementThreshold ||<br>
FI.Branches > BranchThreshold) {<br>
diag(P.first->getLocation(),<br>
- "function '%0' exceeds recommended size/complexity thresholds")<br>
- << P.first->getNameAsString();<br>
+ "function %0 exceeds recommended size/complexity thresholds")<br>
+ << P.first;<br>
}<br>
<br>
if (FI.Lines > LineThreshold) {<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-tidy/misc-definitions-in-headers.hpp Thu Apr 7 09:55:25 2016<br>
@@ -28,7 +28,7 @@ void CA::f2() { }<br>
<br>
template <><br>
int CA::f3() {<br>
-// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: function 'f3' defined in a header file;<br>
+// CHECK-MESSAGES: :[[@LINE-1]]:9: warning: function 'f3<int>' defined in a header file;<br>
int a = 1;<br>
return a;<br>
}<br>
@@ -90,7 +90,7 @@ T f3() {<br>
}<br>
<br>
template <><br>
-// CHECK-MESSAGES: :[[@LINE+1]]:5: warning: function 'f3' defined in a header file;<br>
+// CHECK-MESSAGES: :[[@LINE+1]]:5: warning: function 'f3<int>' defined in a header file;<br>
int f3() {<br>
int a = 1;<br>
return a;<br>
<br>
Modified: clang-tools-extra/trunk/test/clang-tidy/performance-faster-string-find.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/performance-faster-string-find.cpp?rev=265680&r1=265679&r2=265680&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/performance-faster-string-find.cpp?rev=265680&r1=265679&r2=265680&view=diff</a><br>
==============================================================================<br>
--- clang-tools-extra/trunk/test/clang-tidy/performance-faster-string-find.cpp (original)<br>
+++ clang-tools-extra/trunk/test/clang-tidy/performance-faster-string-find.cpp Thu Apr 7 09:55:25 2016<br>
@@ -33,12 +33,12 @@ void StringFind() {<br>
std::string Str;<br>
<br>
Str.find("a");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:12: warning: find called with a string literal consisting of a single character; consider using the more effective overload accepting a character [performance-faster-string-find]<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:12: warning: 'find' called with a string literal consisting of a single character; consider using the more effective overload accepting a character [performance-faster-string-find]<br>
// CHECK-FIXES: Str.find('a');<br>
<br>
// Works with the pos argument.<br>
Str.find("a", 1);<br>
- // CHECK-MESSAGES: [[@LINE-1]]:12: warning: find called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:12: warning: 'find' called with a string literal<br>
// CHECK-FIXES: Str.find('a', 1);<br>
<br>
// Doens't work with strings smaller or larger than 1 char.<br>
@@ -50,35 +50,35 @@ void StringFind() {<br>
<br>
// Other methods that can also be replaced<br>
Str.rfind("a");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:13: warning: rfind called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:13: warning: 'rfind' called with a string literal<br>
// CHECK-FIXES: Str.rfind('a');<br>
Str.find_first_of("a");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:21: warning: find_first_of called with a string<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:21: warning: 'find_first_of' called with a string<br>
// CHECK-FIXES: Str.find_first_of('a');<br>
Str.find_first_not_of("a");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:25: warning: find_first_not_of called with a<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:25: warning: 'find_first_not_of' called with a<br>
// CHECK-FIXES: Str.find_first_not_of('a');<br>
Str.find_last_of("a");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:20: warning: find_last_of called with a string<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:20: warning: 'find_last_of' called with a string<br>
// CHECK-FIXES: Str.find_last_of('a');<br>
Str.find_last_not_of("a");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:24: warning: find_last_not_of called with a<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:24: warning: 'find_last_not_of' called with a<br>
// CHECK-FIXES: Str.find_last_not_of('a');<br>
<br>
// std::wstring should work.<br>
std::wstring WStr;<br>
WStr.find(L"n");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:13: warning: find called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:13: warning: 'find' called with a string literal<br>
// CHECK-FIXES: Str.find(L'n');<br>
// Even with unicode that fits in one wide char.<br>
WStr.find(L"\x3A9");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:13: warning: find called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:13: warning: 'find' called with a string literal<br>
// CHECK-FIXES: Str.find(L'\x3A9');<br>
<br>
// Also with other types, but only if it was specified in the options.<br>
llvm::StringRef sr;<br>
sr.find("x");<br>
- // CHECK-MESSAGES: [[@LINE-1]]:11: warning: find called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:11: warning: 'find' called with a string literal<br>
// CHECK-FIXES: sr.find('x');<br>
NotStringRef nsr;<br>
nsr.find("x");<br>
@@ -92,7 +92,7 @@ int FindTemplateDependant(T value) {<br>
template <typename T><br>
int FindTemplateNotDependant(T pos) {<br>
return std::string().find("A", pos);<br>
- // CHECK-MESSAGES: [[@LINE-1]]:29: warning: find called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:29: warning: 'find' called with a string literal<br>
// CHECK-FIXES: return std::string().find('A', pos);<br>
}<br>
<br>
@@ -105,6 +105,6 @@ int FindStr() {<br>
<br>
int Macros() {<br>
return STR_MACRO(std::string()) + POS_MACRO(1);<br>
- // CHECK-MESSAGES: [[@LINE-1]]:10: warning: find called with a string literal<br>
- // CHECK-MESSAGES: [[@LINE-2]]:37: warning: find called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-1]]:10: warning: 'find' called with a string literal<br>
+ // CHECK-MESSAGES: [[@LINE-2]]:37: warning: 'find' called with a string literal<br>
}<br>
<br>
<br>
_______________________________________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>