replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[clang-tidy] Fixed two wrong fix-it cases in misc-inefficient-algorithm checker. 

llvm-svn: 229552
This commit is contained in:
Gabor Horvath 2015-02-17 21:45:38 +00:00
parent 8dfa40b84b
commit 21b76badeb
2 changed files with 59 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
clang-tools-extra/clang-tidy/misc/InefficientAlgorithmCheck.cpp
View File

@ -17,9 +17,18 @@ using namespace clang::ast_matchers;
namespace clang {
namespace tidy {
static bool areTypesCompatible(QualType Left, QualType Right) {
if (const auto *LeftRefType = Left->getAs<ReferenceType>())
Left = LeftRefType->getPointeeType();
if (const auto *RightRefType = Right->getAs<ReferenceType>())
Right = RightRefType->getPointeeType();
return Left->getCanonicalTypeUnqualified() ==
Right->getCanonicalTypeUnqualified();
}
void InefficientAlgorithmCheck::registerMatchers(MatchFinder *Finder) {
const std::string Algorithms =
"^::std::(find|count|equal_range|lower_blound|upper_bound)$";
"^::std::(find|count|equal_range|lower_bound|upper_bound)$";
const auto ContainerMatcher = classTemplateSpecializationDecl(
matchesName("^::std::(unordered_)?(multi)?(set|map)$"));
const auto Matcher =
@ -57,6 +66,14 @@ void InefficientAlgorithmCheck::check(const MatchFinder::MatchResult &Result) {
const llvm::StringRef IneffContName = IneffCont->getName();
const bool Unordered =
IneffContName.find("unordered") != llvm::StringRef::npos;
const bool Maplike = IneffContName.find("map") != llvm::StringRef::npos;
// Store if the key type of the container is compatible with the value
// that is searched for.
QualType ValueType = AlgCall->getArg(2)->getType();
QualType KeyType =
IneffCont->getTemplateArgs()[0].getAsType().getCanonicalType();
const bool CompatibleTypes = areTypesCompatible(KeyType, ValueType);
// Check if the comparison type for the algorithm and the container matches.
if (AlgCall->getNumArgs() == 4 && !Unordered) {
@ -87,7 +104,7 @@ void InefficientAlgorithmCheck::check(const MatchFinder::MatchResult &Result) {
const auto *IneffContExpr = Result.Nodes.getNodeAs<Expr>("IneffContExpr");
FixItHint Hint;
if (!AlgCall->getLocStart().isMacroID()) {
if (!AlgCall->getLocStart().isMacroID() && !Maplike && CompatibleTypes) {
std::string ReplacementText =
(llvm::Twine(Lexer::getSourceText(
CharSourceRange::getTokenRange(IneffContExpr->getSourceRange()),

43
clang-tools-extra/test/clang-tidy/misc-inefficient-algorithm.cpp
View File

@ -23,6 +23,19 @@ template <typename K, typename Cmp = less<K>> struct set {
iterator end() const;
};
struct other_iterator_type {};
template <typename K, typename V, typename Cmp = less<K>> struct map {
typedef other_iterator_type iterator;
iterator find(const K &k);
unsigned count(const K &k);
iterator begin();
iterator end();
iterator begin() const;
iterator end() const;
};
template <typename K> struct unordered_set : set<K> {};
template <typename K, typename Cmp = less<K>> struct multiset : set<K, Cmp> {};
@ -32,15 +45,17 @@ template <typename FwIt, typename K> FwIt find(FwIt, FwIt, const K &);
template <typename FwIt, typename K, typename Cmp>
FwIt find(FwIt, FwIt, const K &, Cmp);
template <typename FwIt, typename Pred>
FwIt find_if(FwIt, FwIt, Pred);
template <typename FwIt, typename Pred> FwIt find_if(FwIt, FwIt, Pred);
template <typename FwIt, typename K> FwIt count(FwIt, FwIt, const K &);
template <typename FwIt, typename K> FwIt lower_bound(FwIt, FwIt, const K &);
template <typename FwIt, typename K, typename Ord>
FwIt lower_bound(FwIt, FwIt, const K &, Ord);
}
#define FIND_IN_SET(x) find(x.begin(), x.end(), 10)
#define FIND_IN_SET(x) find(x.begin(), x.end(), 10)
// CHECK-FIXES: #define FIND_IN_SET(x) find(x.begin(), x.end(), 10)
template <typename T> void f(const T &t) {
@ -93,4 +108,26 @@ int main() {
find(us.begin(), us.end(), 10);
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
// CHECK-FIXES: {{^ }}us.find(10);{{$}}
std::map<int, int> intmap;
find(intmap.begin(), intmap.end(), 46);
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
// CHECK-FIXES: {{^ }}find(intmap.begin(), intmap.end(), 46);{{$}}
}
struct Value {
int value;
};
struct Ordering {
bool operator()(const Value &lhs, const Value &rhs) const {
return lhs.value < rhs.value;
}
bool operator()(int lhs, const Value &rhs) const { return lhs < rhs.value; }
};
void g(std::set<Value, Ordering> container, int value) {
lower_bound(container.begin(), container.end(), value, Ordering());
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: this STL algorithm call should be
// CHECK-FIXES: {{^ }}lower_bound(container.begin(), container.end(), value, Ordering());{{$}}
}