https://github.com/flovent updated
https://github.com/llvm/llvm-project/pull/132596
>From 778f8c2dfa4d3c87e1b260fcff8b4f9f69d5aa50 Mon Sep 17 00:00:00 2001
From: flovent <flb...@protonmail.com>
Date: Sun, 23 Mar 2025 14:54:28 +0800
Subject: [PATCH 1/2] [clang][analyzer] Improve the modeling of insert in
MismatchedIteratorChecker
---
.../Checkers/MismatchedIteratorChecker.cpp | 18 ++++++++++++------
.../Inputs/system-header-simulator-cxx.h | 4 ++++
clang/test/Analysis/issue-132010.cpp | 12 ++++++++++++
clang/test/Analysis/mismatched-iterator.cpp | 10 ++++++++++
4 files changed, 38 insertions(+), 6 deletions(-)
create mode 100644 clang/test/Analysis/issue-132010.cpp
diff --git a/clang/lib/StaticAnalyzer/Checkers/MismatchedIteratorChecker.cpp
b/clang/lib/StaticAnalyzer/Checkers/MismatchedIteratorChecker.cpp
index 82a6228318179..1c101b91f727f 100644
--- a/clang/lib/StaticAnalyzer/Checkers/MismatchedIteratorChecker.cpp
+++ b/clang/lib/StaticAnalyzer/Checkers/MismatchedIteratorChecker.cpp
@@ -91,12 +91,18 @@ void MismatchedIteratorChecker::checkPreCall(const
CallEvent &Call,
InstCall->getCXXThisVal().getAsRegion());
}
} else if (isInsertCall(Func)) {
- verifyMatch(C, Call.getArgSVal(0),
- InstCall->getCXXThisVal().getAsRegion());
- if (Call.getNumArgs() == 3 &&
- isIteratorType(Call.getArgExpr(1)->getType()) &&
- isIteratorType(Call.getArgExpr(2)->getType())) {
- verifyMatch(C, Call.getArgSVal(1), Call.getArgSVal(2));
+ if (Call.getNumArgs() == 2 &&
+ isIteratorType(Call.getArgExpr(0)->getType()) &&
+ isIteratorType(Call.getArgExpr(1)->getType())) {
+ verifyMatch(C, Call.getArgSVal(0), Call.getArgSVal(1));
+ } else {
+ verifyMatch(C, Call.getArgSVal(0),
+ InstCall->getCXXThisVal().getAsRegion());
+ if (Call.getNumArgs() == 3 &&
+ isIteratorType(Call.getArgExpr(1)->getType()) &&
+ isIteratorType(Call.getArgExpr(2)->getType())) {
+ verifyMatch(C, Call.getArgSVal(1), Call.getArgSVal(2));
+ }
}
} else if (isEmplaceCall(Func)) {
verifyMatch(C, Call.getArgSVal(0),
diff --git a/clang/test/Analysis/Inputs/system-header-simulator-cxx.h
b/clang/test/Analysis/Inputs/system-header-simulator-cxx.h
index a379a47515668..c5aeb0af9d578 100644
--- a/clang/test/Analysis/Inputs/system-header-simulator-cxx.h
+++ b/clang/test/Analysis/Inputs/system-header-simulator-cxx.h
@@ -1244,6 +1244,7 @@ template<
class Alloc = std::allocator<Key>
> class unordered_set {
public:
+ unordered_set() {}
unordered_set(initializer_list<Key> __list) {}
class iterator {
@@ -1260,6 +1261,9 @@ template<
Key *val;
iterator begin() const { return iterator(val); }
iterator end() const { return iterator(val + 1); }
+
+ template< class InputIt >
+ void insert( InputIt first, InputIt last );
};
template <typename T>
diff --git a/clang/test/Analysis/issue-132010.cpp
b/clang/test/Analysis/issue-132010.cpp
new file mode 100644
index 0000000000000..abdaed57f26b9
--- /dev/null
+++ b/clang/test/Analysis/issue-132010.cpp
@@ -0,0 +1,12 @@
+// RUN: %clang_analyze_cc1 -analyzer-config
aggressive-binary-operation-simplification=true
-analyzer-checker=alpha.cplusplus.MismatchedIterator -analyzer-output text
-verify %s
+
+// expected-no-diagnostics
+
+#include "Inputs/system-header-simulator-cxx.h"
+
+void f()
+{
+ std::list<int> l;
+ std::unordered_set<int> us;
+ us.insert(l.cbegin(), l.cend()); // no warning
+}
diff --git a/clang/test/Analysis/mismatched-iterator.cpp
b/clang/test/Analysis/mismatched-iterator.cpp
index 570e742751ead..325e7764ad7fa 100644
--- a/clang/test/Analysis/mismatched-iterator.cpp
+++ b/clang/test/Analysis/mismatched-iterator.cpp
@@ -19,6 +19,11 @@ void good_insert4(std::vector<int> &V, int len, int n) {
V.insert(V.cbegin(), {n-1, n, n+1}); // no-warning
}
+void good_insert5(std::vector<int> &V, int len, int n) {
+ std::unordered_set<int> us;
+ us.insert(V.cbegin(), V.cend()); // no-warning
+}
+
void good_insert_find(std::vector<int> &V, int n, int m) {
auto i = std::find(V.cbegin(), V.cend(), n);
V.insert(i, m); // no-warning
@@ -70,6 +75,11 @@ void bad_insert4(std::vector<int> &V1, std::vector<int> &V2,
int len, int n) {
V2.insert(V1.cbegin(), {n-1, n, n+1}); // expected-warning{{Container
accessed using foreign iterator argument}}
}
+void bad_insert5(std::vector<int> &V1, std::vector<int> &V2, int len, int n) {
+ std::unordered_set<int> us;
+ us.insert(V1.cbegin(), V2.cend()); // expected-warning{{Iterators of
different containers used where the same container is expected}}
+}
+
void bad_erase1(std::vector<int> &V1, std::vector<int> &V2) {
V2.erase(V1.cbegin()); // expected-warning{{Container accessed using foreign
iterator argument}}
}
>From a8cde1217f73e48b78fd80b7d244fb2cc80a7149 Mon Sep 17 00:00:00 2001
From: flovent <flb...@protonmail.com>
Date: Sun, 23 Mar 2025 16:29:26 +0800
Subject: [PATCH 2/2] delete redundant testcase file
---
clang/test/Analysis/issue-132010.cpp | 12 ------------
1 file changed, 12 deletions(-)
delete mode 100644 clang/test/Analysis/issue-132010.cpp
diff --git a/clang/test/Analysis/issue-132010.cpp
b/clang/test/Analysis/issue-132010.cpp
deleted file mode 100644
index abdaed57f26b9..0000000000000
--- a/clang/test/Analysis/issue-132010.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-// RUN: %clang_analyze_cc1 -analyzer-config
aggressive-binary-operation-simplification=true
-analyzer-checker=alpha.cplusplus.MismatchedIterator -analyzer-output text
-verify %s
-
-// expected-no-diagnostics
-
-#include "Inputs/system-header-simulator-cxx.h"
-
-void f()
-{
- std::list<int> l;
- std::unordered_set<int> us;
- us.insert(l.cbegin(), l.cend()); // no warning
-}
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
