From ce42bd6765e91cb62559bc474410fdaeb9a35a5c Mon Sep 17 00:00:00 2001 From: Artem Dergachev Date: Mon, 17 Dec 2018 06:30:39 +0000 Subject: [PATCH] [analyzer] MoveChecker: Enable by default as cplusplus.Move. This checker warns you when you re-use an object after moving it. Mostly developed by Peter Szecsi! Differential Revision: https://reviews.llvm.org/D38675 llvm-svn: 349328 --- .../clang/StaticAnalyzer/Checkers/Checkers.td | 6 +++--- clang/test/Analysis/mismatched-iterator.cpp | 5 ++++- clang/test/Analysis/use-after-move.cpp | 20 +++++++++---------- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td b/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td index 5280ad70e9e24..0d16de1ccc6df 100644 --- a/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td +++ b/clang/include/clang/StaticAnalyzer/Checkers/Checkers.td @@ -275,6 +275,9 @@ def NewDeleteLeaksChecker : Checker<"NewDeleteLeaks">, def CXXSelfAssignmentChecker : Checker<"SelfAssignment">, HelpText<"Checks C++ copy and move assignment operators for self assignment">; +def MoveChecker: Checker<"Move">, + HelpText<"Find use-after-move bugs in C++">; + } // end: "cplusplus" let ParentPackage = CplusplusOptIn in { @@ -303,9 +306,6 @@ def MismatchedIteratorChecker : Checker<"MismatchedIterator">, HelpText<"Check for use of iterators of different containers where iterators " "of the same container are expected">; -def MoveChecker: Checker<"Move">, - HelpText<"Find use-after-move bugs in C++">; - def UninitializedObjectChecker: Checker<"UninitializedObject">, HelpText<"Reports uninitialized fields after object construction">; diff --git a/clang/test/Analysis/mismatched-iterator.cpp b/clang/test/Analysis/mismatched-iterator.cpp index 23f54d3f796a1..756d095443576 100644 --- a/clang/test/Analysis/mismatched-iterator.cpp +++ b/clang/test/Analysis/mismatched-iterator.cpp @@ -100,7 +100,7 @@ void good_move_find2(std::vector &v1, std::vector &v2, int n) { void good_move_find3(std::vector &v1, std::vector &v2, int n) { auto i0 = v2.cend(); v1 = std::move(v2); - v2.push_back(n); + v2.push_back(n); // expected-warning{{Method called on moved-from object of type 'std::vector'}} std::find(v2.cbegin(), i0, n); // no-warning } @@ -125,6 +125,7 @@ void bad_move_find1(std::vector &v1, std::vector &v2, int n) { auto i0 = v2.cbegin(); v1 = std::move(v2); std::find(i0, v2.cend(), n); // expected-warning{{Iterators of different containers used where the same container is expected}} + // expected-warning@-1{{Method called on moved-from object of type 'std::vector'}} } void bad_insert_find(std::vector &v1, std::vector &v2, int n, int m) { @@ -167,12 +168,14 @@ void bad_move(std::vector &v1, std::vector &v2) { const auto i0 = ++v2.cbegin(); v1 = std::move(v2); v2.erase(i0); // expected-warning{{Container accessed using foreign iterator argument}} + // expected-warning@-1{{Method called on moved-from object of type 'std::vector'}} } void bad_move_find2(std::vector &v1, std::vector &v2, int n) { auto i0 = --v2.cend(); v1 = std::move(v2); std::find(i0, v2.cend(), n); // expected-warning{{Iterators of different containers used where the same container is expected}} + // expected-warning@-1{{Method called on moved-from object of type 'std::vector'}} } void bad_move_find3(std::vector &v1, std::vector &v2, int n) { diff --git a/clang/test/Analysis/use-after-move.cpp b/clang/test/Analysis/use-after-move.cpp index 652f08f45cb36..280724512f8aa 100644 --- a/clang/test/Analysis/use-after-move.cpp +++ b/clang/test/Analysis/use-after-move.cpp @@ -1,30 +1,30 @@ -// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.cplusplus.Move -verify %s\ +// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.Move -verify %s\ // RUN: -std=c++11 -analyzer-output=text -analyzer-config eagerly-assume=false\ // RUN: -analyzer-config exploration_strategy=unexplored_first_queue\ // RUN: -analyzer-checker debug.ExprInspection -// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.cplusplus.Move -verify %s\ +// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.Move -verify %s\ // RUN: -std=c++11 -analyzer-output=text -analyzer-config eagerly-assume=false\ // RUN: -analyzer-config exploration_strategy=dfs -DDFS=1\ // RUN: -analyzer-checker debug.ExprInspection -// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.cplusplus.Move -verify %s\ +// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.Move -verify %s\ // RUN: -std=c++11 -analyzer-output=text -analyzer-config eagerly-assume=false\ // RUN: -analyzer-config exploration_strategy=unexplored_first_queue\ -// RUN: -analyzer-config alpha.cplusplus.Move:WarnOn=KnownsOnly -DPEACEFUL\ +// RUN: -analyzer-config cplusplus.Move:WarnOn=KnownsOnly -DPEACEFUL\ // RUN: -analyzer-checker debug.ExprInspection -// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.cplusplus.Move -verify %s\ +// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.Move -verify %s\ // RUN: -std=c++11 -analyzer-output=text -analyzer-config eagerly-assume=false\ // RUN: -analyzer-config exploration_strategy=dfs -DDFS=1\ -// RUN: -analyzer-config alpha.cplusplus.Move:WarnOn=KnownsOnly -DPEACEFUL\ +// RUN: -analyzer-config cplusplus.Move:WarnOn=KnownsOnly -DPEACEFUL\ // RUN: -analyzer-checker debug.ExprInspection -// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.cplusplus.Move -verify %s\ +// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.Move -verify %s\ // RUN: -std=c++11 -analyzer-output=text -analyzer-config eagerly-assume=false\ // RUN: -analyzer-config exploration_strategy=unexplored_first_queue\ -// RUN: -analyzer-config alpha.cplusplus.Move:WarnOn=All -DAGGRESSIVE\ +// RUN: -analyzer-config cplusplus.Move:WarnOn=All -DAGGRESSIVE\ // RUN: -analyzer-checker debug.ExprInspection -// RUN: %clang_analyze_cc1 -analyzer-checker=alpha.cplusplus.Move -verify %s\ +// RUN: %clang_analyze_cc1 -analyzer-checker=cplusplus.Move -verify %s\ // RUN: -std=c++11 -analyzer-output=text -analyzer-config eagerly-assume=false\ // RUN: -analyzer-config exploration_strategy=dfs -DDFS=1\ -// RUN: -analyzer-config alpha.cplusplus.Move:WarnOn=All -DAGGRESSIVE\ +// RUN: -analyzer-config cplusplus.Move:WarnOn=All -DAGGRESSIVE\ // RUN: -analyzer-checker debug.ExprInspection #include "Inputs/system-header-simulator-cxx.h"