Skip to content

Commit 4273313

Browse files
saiislamsaiislam
authored
merge main into amd-staging (llvm#1506)
2 parents f309fea + 1979051 commit 4273313

File tree

23 files changed

+315
-145
lines changed

23 files changed

+315
-145
lines changed

‎clang-tools-extra/clang-tidy/bugprone/CapturingThisInMemberVariableCheck.cpp

Lines changed: 41 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,16 +64,23 @@ AST_MATCHER(CXXRecordDecl, correctHandleCaptureThisLambda) {
6464

6565
constexpr const char *DefaultFunctionWrapperTypes =
6666
"::std::function;::std::move_only_function;::boost::function";
67+
constexpr const char *DefaultBindFunctions =
68+
"::std::bind;::boost::bind;::std::bind_front;::std::bind_back;"
69+
"::boost::compat::bind_front;::boost::compat::bind_back";
6770

6871
CapturingThisInMemberVariableCheck::CapturingThisInMemberVariableCheck(
6972
StringRef Name, ClangTidyContext *Context)
7073
: ClangTidyCheck(Name, Context),
7174
FunctionWrapperTypes(utils::options::parseStringList(
72-
Options.get("FunctionWrapperTypes", DefaultFunctionWrapperTypes))) {}
75+
Options.get("FunctionWrapperTypes", DefaultFunctionWrapperTypes))),
76+
BindFunctions(utils::options::parseStringList(
77+
Options.get("BindFunctions", DefaultBindFunctions))) {}
7378
void CapturingThisInMemberVariableCheck::storeOptions(
7479
ClangTidyOptions::OptionMap &Opts) {
7580
Options.store(Opts, "FunctionWrapperTypes",
7681
utils::options::serializeStringList(FunctionWrapperTypes));
82+
Options.store(Opts, "BindFunctions",
83+
utils::options::serializeStringList(BindFunctions));
7784
}
7885

7986
void CapturingThisInMemberVariableCheck::registerMatchers(MatchFinder *Finder) {
@@ -87,33 +94,52 @@ void CapturingThisInMemberVariableCheck::registerMatchers(MatchFinder *Finder) {
8794
// [self = this]
8895
capturesVar(varDecl(hasInitializer(cxxThisExpr())))));
8996
auto IsLambdaCapturingThis =
90-
lambdaExpr(hasAnyCapture(CaptureThis.bind("capture"))).bind("lambda");
91-
auto IsInitWithLambda =
92-
anyOf(IsLambdaCapturingThis,
93-
cxxConstructExpr(hasArgument(0, IsLambdaCapturingThis)));
97+
lambdaExpr(hasAnyCapture(CaptureThis)).bind("lambda");
98+
99+
auto IsBindCapturingThis =
100+
callExpr(
101+
callee(functionDecl(matchers::matchesAnyListedName(BindFunctions))
102+
.bind("callee")),
103+
hasAnyArgument(cxxThisExpr()))
104+
.bind("bind");
105+
106+
auto IsInitWithLambdaOrBind =
107+
anyOf(IsLambdaCapturingThis, IsBindCapturingThis,
108+
cxxConstructExpr(hasArgument(
109+
0, anyOf(IsLambdaCapturingThis, IsBindCapturingThis))));
110+
94111
Finder->addMatcher(
95112
cxxRecordDecl(
96113
anyOf(has(cxxConstructorDecl(
97114
unless(isCopyConstructor()), unless(isMoveConstructor()),
98115
hasAnyConstructorInitializer(cxxCtorInitializer(
99116
isMemberInitializer(), forField(IsStdFunctionField),
100-
withInitializer(IsInitWithLambda))))),
117+
withInitializer(IsInitWithLambdaOrBind))))),
101118
has(fieldDecl(IsStdFunctionField,
102-
hasInClassInitializer(IsInitWithLambda)))),
119+
hasInClassInitializer(IsInitWithLambdaOrBind)))),
103120
unless(correctHandleCaptureThisLambda())),
104121
this);
105122
}
106-
107123
void CapturingThisInMemberVariableCheck::check(
108124
const MatchFinder::MatchResult &Result) {
109-
const auto *Capture = Result.Nodes.getNodeAs<LambdaCapture>("capture");
110-
const auto *Lambda = Result.Nodes.getNodeAs<LambdaExpr>("lambda");
125+
if (const auto *Lambda = Result.Nodes.getNodeAs<LambdaExpr>("lambda")) {
126+
diag(Lambda->getBeginLoc(),
127+
"'this' captured by a lambda and stored in a class member variable; "
128+
"disable implicit class copying/moving to prevent potential "
129+
"use-after-free");
130+
} else if (const auto *Bind = Result.Nodes.getNodeAs<CallExpr>("bind")) {
131+
const auto *Callee = Result.Nodes.getNodeAs<FunctionDecl>("callee");
132+
assert(Callee);
133+
diag(Bind->getBeginLoc(),
134+
"'this' captured by a '%0' call and stored in a class member "
135+
"variable; disable implicit class copying/moving to prevent potential "
136+
"use-after-free")
137+
<< Callee->getQualifiedNameAsString();
138+
}
139+
111140
const auto *Field = Result.Nodes.getNodeAs<FieldDecl>("field");
112-
diag(Lambda->getBeginLoc(),
113-
"'this' captured by a lambda and stored in a class member variable; "
114-
"disable implicit class copying/moving to prevent potential "
115-
"use-after-free")
116-
<< Capture->getLocation();
141+
assert(Field);
142+
117143
diag(Field->getLocation(),
118144
"class member of type '%0' that stores captured 'this'",
119145
DiagnosticIDs::Note)

‎clang-tools-extra/clang-tidy/bugprone/CapturingThisInMemberVariableCheck.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ class CapturingThisInMemberVariableCheck : public ClangTidyCheck {
3737
private:
3838
///< store the function wrapper types
3939
const std::vector<StringRef> FunctionWrapperTypes;
40+
const std::vector<StringRef> BindFunctions;
4041
};
4142

4243
} // namespace clang::tidy::bugprone

‎clang-tools-extra/docs/ReleaseNotes.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -103,8 +103,9 @@ New checks
103103
- New :doc:`bugprone-capturing-this-in-member-variable
104104
<clang-tidy/checks/bugprone/capturing-this-in-member-variable>` check.
105105

106-
Finds lambda captures that capture the ``this`` pointer and store it as class
107-
members without handle the copy and move constructors and the assignments.
106+
Finds lambda captures and ``bind`` function calls that capture the ``this``
107+
pointer and store it as class members without handle the copy and move
108+
constructors and the assignments.
108109

109110
- New :doc:`bugprone-unintended-char-ostream-output
110111
<clang-tidy/checks/bugprone/unintended-char-ostream-output>` check.

‎clang-tools-extra/docs/clang-tidy/checks/bugprone/capturing-this-in-member-variable.rst

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,3 +40,10 @@ Options
4040
A semicolon-separated list of names of types. Used to specify function
4141
wrapper that can hold lambda expressions.
4242
Default is `::std::function;::std::move_only_function;::boost::function`.
43+
44+
.. option:: BindFunctions
45+
46+
A semicolon-separated list of fully qualified names of functions that can
47+
capture ``this`` pointer.
48+
Default is `::std::bind;::boost::bind;::std::bind_front;::std::bind_back;
49+
::boost::compat::bind_front;::boost::compat::bind_back`.

‎clang-tools-extra/test/clang-tidy/checkers/bugprone/capturing-this-in-member-variable.cpp

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// RUN: %check_clang_tidy -std=c++11-or-later %s bugprone-capturing-this-in-member-variable %t -- -config="{CheckOptions: {bugprone-capturing-this-in-member-variable.FunctionWrapperTypes: '::std::function;::Fn'}}" --
1+
// RUN: %check_clang_tidy -std=c++11-or-later %s bugprone-capturing-this-in-member-variable %t -- -config="{CheckOptions: {bugprone-capturing-this-in-member-variable.FunctionWrapperTypes: '::std::function;::Fn', bugprone-capturing-this-in-member-variable.BindFunctions: '::std::bind;::Bind'}}" --
22

33
namespace std {
44

@@ -12,12 +12,22 @@ class function<R(Args...)> {
1212
template<class F> function(F &&);
1313
};
1414

15+
template <typename F, typename... Args>
16+
function<F(Args...)> bind(F&&, Args&&...) {
17+
return {};
18+
}
19+
1520
} // namespace std
1621

1722
struct Fn {
1823
template<class F> Fn(F &&);
1924
};
2025

26+
template <typename F, typename... Args>
27+
std::function<F(Args...)> Bind(F&&, Args&&...) {
28+
return {};
29+
}
30+
2131
struct BasicConstructor {
2232
BasicConstructor() : Captured([this]() { static_cast<void>(this); }) {}
2333
// CHECK-MESSAGES: :[[@LINE-1]]:33: warning: 'this' captured by a lambda and stored in a class member variable;
@@ -208,3 +218,49 @@ struct CustomFunctionWrapper {
208218
Fn Captured;
209219
// CHECK-MESSAGES: :[[@LINE-1]]:6: note: class member of type 'Fn' that stores captured 'this'
210220
};
221+
222+
struct BindConstructor {
223+
BindConstructor() : Captured(std::bind(&BindConstructor::method, this)) {}
224+
// CHECK-MESSAGES: :[[@LINE-1]]:32: warning: 'this' captured by a 'std::bind' call and stored in a class member variable;
225+
void method() {}
226+
std::function<void()> Captured;
227+
// CHECK-MESSAGES: :[[@LINE-1]]:25: note: class member of type 'std::function<void (void)>' that stores captured 'this'
228+
};
229+
230+
struct BindField1 {
231+
void method() {}
232+
std::function<void()> Captured = std::bind(&BindField1::method, this);
233+
// CHECK-MESSAGES: :[[@LINE-1]]:36: warning: 'this' captured by a 'std::bind' call and stored in a class member variable;
234+
// CHECK-MESSAGES: :[[@LINE-2]]:25: note: class member of type 'std::function<void (void)>' that stores captured 'this'
235+
};
236+
237+
struct BindField2 {
238+
void method() {}
239+
std::function<void()> Captured{std::bind(&BindField2::method, this)};
240+
// CHECK-MESSAGES: :[[@LINE-1]]:34: warning: 'this' captured by a 'std::bind' call and stored in a class member variable;
241+
// CHECK-MESSAGES: :[[@LINE-2]]:25: note: class member of type 'std::function<void (void)>' that stores captured 'this'
242+
};
243+
244+
struct BindCustom {
245+
BindCustom() : Captured(Bind(&BindCustom::method, this)) {}
246+
// CHECK-MESSAGES: :[[@LINE-1]]:27: warning: 'this' captured by a 'Bind' call and stored in a class member variable;
247+
void method() {}
248+
std::function<void()> Captured;
249+
// CHECK-MESSAGES: :[[@LINE-1]]:25: note: class member of type 'std::function<void (void)>' that stores captured 'this'
250+
};
251+
252+
struct BindNotCapturingThis {
253+
void method(int) {}
254+
BindNotCapturingThis(int V) : Captured(std::bind(&BindNotCapturingThis::method, V)) {}
255+
std::function<void()> Captured;
256+
};
257+
258+
struct DeletedCopyMoveWithBind {
259+
DeletedCopyMoveWithBind() : Captured(std::bind(&DeletedCopyMoveWithBind::method, this)) {}
260+
DeletedCopyMoveWithBind(DeletedCopyMoveWithBind const&) = delete;
261+
DeletedCopyMoveWithBind(DeletedCopyMoveWithBind &&) = delete;
262+
DeletedCopyMoveWithBind& operator=(DeletedCopyMoveWithBind const&) = delete;
263+
DeletedCopyMoveWithBind& operator=(DeletedCopyMoveWithBind &&) = delete;
264+
void method() {}
265+
std::function<void()> Captured;
266+
};

‎clang/lib/AST/ASTContext.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7011,7 +7011,7 @@ TemplateName ASTContext::getCanonicalTemplateName(TemplateName Name,
70117011
getCanonicalTemplateArgument(subst->getArgumentPack());
70127012
return getSubstTemplateTemplateParmPack(
70137013
canonArgPack, subst->getAssociatedDecl()->getCanonicalDecl(),
7014-
subst->getFinal(), subst->getIndex());
7014+
subst->getIndex(), subst->getFinal());
70157015
}
70167016
case TemplateName::DeducedTemplate: {
70177017
assert(IgnoreDeduced == false);

‎clang/lib/Driver/ToolChains/Arch/X86.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,9 @@ void x86::getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple,
252252
D.Diag(diag::warn_drv_deprecated_arg) << Name << 1 << Name.drop_back(4);
253253
else if (Width == "256")
254254
D.Diag(diag::warn_drv_deprecated_custom)
255-
<< Name << "because AVX10/256 is not supported and will be removed";
255+
<< Name
256+
<< "no alternative argument provided because "
257+
"AVX10/256 is not supported and will be removed";
256258
else
257259
assert((Width == "256" || Width == "512") && "Invalid vector length.");
258260
Features.push_back(Args.MakeArgString((IsNegative ? "-" : "+") + Name));
@@ -286,7 +288,9 @@ void x86::getX86TargetFeatures(const Driver &D, const llvm::Triple &Triple,
286288
if (A->getOption().matches(options::OPT_mevex512) ||
287289
A->getOption().matches(options::OPT_mno_evex512))
288290
D.Diag(diag::warn_drv_deprecated_custom)
289-
<< Name << "because AVX10/256 is not supported and will be removed";
291+
<< Name
292+
<< "no alternative argument provided because "
293+
"AVX10/256 is not supported and will be removed";
290294

291295
if (A->getOption().matches(options::OPT_mapx_features_EQ) ||
292296
A->getOption().matches(options::OPT_mno_apx_features_EQ)) {

‎clang/lib/Serialization/ASTReaderStmt.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2229,6 +2229,7 @@ void ASTStmtReader::VisitSubstNonTypeTemplateParmExpr(
22292229
E->PackIndex = Record.readInt();
22302230
else
22312231
E->PackIndex = 0;
2232+
E->Final = CurrentUnpackingBits->getNextBit();
22322233
E->SubstNonTypeTemplateParmExprBits.NameLoc = readSourceLocation();
22332234
E->Replacement = Record.readSubExpr();
22342235
}

‎clang/lib/Serialization/ASTWriterStmt.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2229,6 +2229,7 @@ void ASTStmtWriter::VisitSubstNonTypeTemplateParmExpr(
22292229
CurrentPackingBits.addBit((bool)E->getPackIndex());
22302230
if (auto PackIndex = E->getPackIndex())
22312231
Record.push_back(*PackIndex + 1);
2232+
CurrentPackingBits.addBit(E->getFinal());
22322233

22332234
Record.AddSourceLocation(E->getNameLoc());
22342235
Record.AddStmt(E->getReplacement());

‎clang/test/CXX/drs/cwg15xx.cpp

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ namespace cwg1512 { // cwg1512: 4
3838
template<typename A, typename B, typename C> void composite_pointer_type_is_ord() {
3939
composite_pointer_type_is_base<A, B, C>();
4040

41-
typedef __typeof(val<A>() < val<B>()) cmp; // #cwg1512-lt
41+
typedef __typeof(val<A>() < val<B>()) cmp; // #cwg1512-lt
4242
// since-cxx17-warning@#cwg1512-lt {{ordered comparison of function pointers ('int (*)() noexcept' and 'int (*)()')}}
4343
// since-cxx17-note@#cwg1512-noexcept-1st {{in instantiation of function template specialization 'cwg1512::composite_pointer_type_is_ord<int (*)() noexcept, int (*)(), int (*)()>' requested here}}
4444
// since-cxx17-warning@#cwg1512-lt {{ordered comparison of function pointers ('int (*)()' and 'int (*)() noexcept')}}
@@ -332,7 +332,7 @@ namespace cwg1550 { // cwg1550: 3.4
332332
namespace cwg1558 { // cwg1558: 12
333333
#if __cplusplus >= 201103L
334334
template<class T, class...> using first_of = T;
335-
template<class T> first_of<void, typename T::type> f(int); // #cwg1558-f
335+
template<class T> first_of<void, typename T::type> f(int); // #cwg1558-f
336336
template<class T> void f(...) = delete; // #cwg1558-f-deleted
337337

338338
struct X { typedef void type; };
@@ -639,7 +639,7 @@ namespace cwg1591 { //cwg1591. Deducing array bound and element type from initi
639639
#if __cplusplus >= 201103L
640640
template<class T, int N> int h(T const(&)[N]);
641641
int X = h({1,2,3}); // T deduced to int, N deduced to 3
642-
642+
643643
template<class T> int j(T const(&)[3]);
644644
int Y = j({42}); // T deduced to int, array bound not considered
645645

@@ -655,12 +655,12 @@ namespace cwg1591 { //cwg1591. Deducing array bound and element type from initi
655655

656656
template<class T, int N> int n(T const(&)[N], T);
657657
int X1 = n({{1},{2},{3}},Aggr()); // OK, T is Aggr, N is 3
658-
659-
658+
659+
660660
namespace check_multi_dim_arrays {
661661
template<class T, int N, int M, int O> int ***f(const T (&a)[N][M][O]); // #cwg1591-f-3
662662
template<class T, int N, int M> int **f(const T (&a)[N][M]); // #cwg1591-f-2
663-
663+
664664
template<class T, int N> int *f(const T (&a)[N]); // #cwg1591-f-1
665665
int ***p3 = f({ { {1,2}, {3, 4} }, { {5,6}, {7, 8} }, { {9,10}, {11, 12} } });
666666
int ***p33 = f({ { {1,2}, {3, 4} }, { {5,6}, {7, 8} }, { {9,10}, {11, 12, 13} } });
@@ -675,7 +675,7 @@ namespace cwg1591 { //cwg1591. Deducing array bound and element type from initi
675675
namespace check_multi_dim_arrays_rref {
676676
template<class T, int N, int M, int O> int ***g(T (&&a)[N][M][O]); // #cwg1591-g-3
677677
template<class T, int N, int M> int **g(T (&&a)[N][M]); // #cwg1591-g-2
678-
678+
679679
template<class T, int N> int *g(T (&&a)[N]); // #cwg1591-g-1
680680
int ***p3 = g({ { {1,2}, {3, 4} }, { {5,6}, {7, 8} }, { {9,10}, {11, 12} } });
681681
int ***p33 = g({ { {1,2}, {3, 4} }, { {5,6}, {7, 8} }, { {9,10}, {11, 12, 13} } });
@@ -687,15 +687,15 @@ namespace cwg1591 { //cwg1591. Deducing array bound and element type from initi
687687
int **p22 = g({ {1,2}, {3, 4} });
688688
int *p1 = g({1, 2, 3});
689689
}
690-
690+
691691
namespace check_arrays_of_init_list {
692692
template<class T, int N> float *h(const std::initializer_list<T> (&)[N]);
693693
template<class T, int N> double *h(const T(&)[N]);
694694
double *p = h({1, 2, 3});
695695
float *fp = h({{1}, {1, 2}, {1, 2, 3}});
696696
}
697697
namespace core_reflector_28543 {
698-
698+
699699
template<class T, int N> int *i(T (&&)[N]); // #1
700700
template<class T> char *i(std::initializer_list<T> &&); // #2
701701
template<class T, int N, int M> int **i(T (&&)[N][M]); // #3 #cwg1591-i-2
@@ -704,13 +704,13 @@ namespace cwg1591 { //cwg1591. Deducing array bound and element type from initi
704704
template<class T> short *i(T (&&)[2]); // #5
705705

706706
template<class T> using Arr = T[];
707-
707+
708708
char *pc = i({1, 2, 3}); // OK prefer #2 via 13.3.3.2 [over.ics.rank]
709-
char *pc2 = i({1, 2}); // #2 also
709+
char *pc2 = i({1, 2}); // #2 also
710710
int *pi = i(Arr<int>{1, 2, 3}); // OK prefer #1
711711

712712
void *pv1 = i({ {1, 2, 3}, {4, 5, 6} }); // ambiguous btw 3 & 4
713-
// since-cxx11-error@-1 {{call to 'i' is ambiguous}}
713+
// since-cxx11-error@-1 {{call to 'i' is ambiguous}}
714714
// since-cxx11-note@#cwg1591-i-2 {{candidate function [with T = int, N = 2, M = 3]}}
715715
// since-cxx11-note@#cwg1591-i-1 {{candidate function [with T = int, N = 2]}}
716716
char **pcc = i({ {1}, {2, 3} }); // OK #4

0 commit comments

Comments
 (0)