Skip to content

Commit 23d32fe

Browse files
author
git apple-llvm automerger
committed
Merge commit 'e80d3212e951' from apple/stable/20210107 into swift/main
2 parents 60df19f + e80d321 commit 23d32fe

File tree

9 files changed

+59
-25
lines changed

9 files changed

+59
-25
lines changed

‎clang/include/clang/StaticAnalyzer/Core/BugReporter/CommonBugCategories.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ extern const char *const UnixAPI;
2121
extern const char *const CXXObjectLifecycle;
2222
extern const char *const CXXMoveSemantics;
2323
extern const char *const SecurityError;
24+
extern const char *const UnusedCode;
2425
} // namespace categories
2526
} // namespace ento
2627
} // namespace clang

‎clang/lib/Analysis/CalledOnceCheck.cpp

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -867,16 +867,14 @@ class CalledOnceChecker : public ConstStmtVisitor<CalledOnceChecker> {
867867
// Let's check if any of the call arguments is a point of interest.
868868
for (const auto &Argument : llvm::enumerate(Arguments)) {
869869
if (auto Index = getIndexOfExpression(Argument.value())) {
870-
ParameterStatus &CurrentParamStatus = CurrentState.getStatusFor(*Index);
871-
872870
if (shouldBeCalledOnce(CallOrMessage, Argument.index())) {
873871
// If the corresponding parameter is marked as 'called_once' we should
874872
// consider it as a call.
875873
processCallFor(*Index, CallOrMessage);
876-
} else if (CurrentParamStatus.getKind() == ParameterStatus::NotCalled) {
874+
} else {
877875
// Otherwise, we mark this parameter as escaped, which can be
878876
// interpreted both as called or not called depending on the context.
879-
CurrentParamStatus = ParameterStatus::Escaped;
877+
processEscapeFor(*Index);
880878
}
881879
// Otherwise, let's keep the state as it is.
882880
}
@@ -910,6 +908,16 @@ class CalledOnceChecker : public ConstStmtVisitor<CalledOnceChecker> {
910908
}
911909
}
912910

911+
/// Process escape of the parameter with the given index
912+
void processEscapeFor(unsigned Index) {
913+
ParameterStatus &CurrentParamStatus = CurrentState.getStatusFor(Index);
914+
915+
// Escape overrides whatever error we think happened.
916+
if (CurrentParamStatus.isErrorStatus()) {
917+
CurrentParamStatus = ParameterStatus::Escaped;
918+
}
919+
}
920+
913921
void findAndReportNotCalledBranches(const CFGBlock *Parent, unsigned Index,
914922
bool IsEscape = false) {
915923
for (const CFGBlock *Succ : Parent->succs()) {
@@ -1365,11 +1373,7 @@ class CalledOnceChecker : public ConstStmtVisitor<CalledOnceChecker> {
13651373
/// Check given parameter that was discovered to escape.
13661374
void checkEscapee(const ParmVarDecl &Parameter) {
13671375
if (auto Index = getIndex(Parameter)) {
1368-
ParameterStatus &CurrentParamStatus = CurrentState.getStatusFor(*Index);
1369-
1370-
if (CurrentParamStatus.getKind() == ParameterStatus::NotCalled) {
1371-
CurrentParamStatus = ParameterStatus::Escaped;
1372-
}
1376+
processEscapeFor(*Index);
13731377
}
13741378
}
13751379

‎clang/lib/StaticAnalyzer/Checkers/DeadStoresChecker.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -260,8 +260,8 @@ class DeadStoreObs : public LiveVariables::Observer {
260260
break;
261261
}
262262

263-
BR.EmitBasicReport(AC->getDecl(), Checker, BugType, "Dead store", os.str(),
264-
L, R, Fixits);
263+
BR.EmitBasicReport(AC->getDecl(), Checker, BugType, categories::UnusedCode,
264+
os.str(), L, R, Fixits);
265265
}
266266

267267
void CheckVarDecl(const VarDecl *VD, const Expr *Ex, const Expr *Val,

‎clang/lib/StaticAnalyzer/Checkers/UnreachableCodeChecker.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ void UnreachableCodeChecker::checkEndAnalysis(ExplodedGraph &G,
169169
if (SM.isInSystemHeader(SL) || SM.isInExternCSystemHeader(SL))
170170
continue;
171171

172-
B.EmitBasicReport(D, this, "Unreachable code", "Dead code",
172+
B.EmitBasicReport(D, this, "Unreachable code", categories::UnusedCode,
173173
"This statement is never executed", DL, SR);
174174
}
175175
}

‎clang/lib/StaticAnalyzer/Core/CommonBugCategories.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ const char *const UnixAPI = "Unix API";
2222
const char *const CXXObjectLifecycle = "C++ object lifecycle";
2323
const char *const CXXMoveSemantics = "C++ move semantics";
2424
const char *const SecurityError = "Security error";
25+
const char *const UnusedCode = "Unused code";
2526
} // namespace categories
2627
} // namespace ento
2728
} // namespace clang

‎clang/test/Analysis/Inputs/expected-plists/edges-new.mm.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2368,7 +2368,7 @@
23682368
</dict>
23692369
</array>
23702370
<key>description</key><string>Value stored to &apos;x&apos; is never read</string>
2371-
<key>category</key><string>Dead store</string>
2371+
<key>category</key><string>Unused code</string>
23722372
<key>type</key><string>Dead increment</string>
23732373
<key>check_name</key><string>deadcode.DeadStores</string>
23742374
<!-- This hash is experimental and going to change! -->
@@ -11409,7 +11409,7 @@
1140911409
</dict>
1141011410
</array>
1141111411
<key>description</key><string>Value stored to &apos;foo&apos; during its initialization is never read</string>
11412-
<key>category</key><string>Dead store</string>
11412+
<key>category</key><string>Unused code</string>
1141311413
<key>type</key><string>Dead initialization</string>
1141411414
<key>check_name</key><string>deadcode.DeadStores</string>
1141511415
<!-- This hash is experimental and going to change! -->

‎clang/test/Analysis/Inputs/expected-plists/objc-arc.m.plist

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@
382382
</dict>
383383
</array>
384384
<key>description</key><string>Value stored to &apos;x&apos; during its initialization is never read</string>
385-
<key>category</key><string>Dead store</string>
385+
<key>category</key><string>Unused code</string>
386386
<key>type</key><string>Dead initialization</string>
387387
<key>check_name</key><string>deadcode.DeadStores</string>
388388
<!-- This hash is experimental and going to change! -->
@@ -450,7 +450,7 @@
450450
</dict>
451451
</array>
452452
<key>description</key><string>Value stored to &apos;obj1&apos; during its initialization is never read</string>
453-
<key>category</key><string>Dead store</string>
453+
<key>category</key><string>Unused code</string>
454454
<key>type</key><string>Dead initialization</string>
455455
<key>check_name</key><string>deadcode.DeadStores</string>
456456
<!-- This hash is experimental and going to change! -->
@@ -518,7 +518,7 @@
518518
</dict>
519519
</array>
520520
<key>description</key><string>Value stored to &apos;obj4&apos; during its initialization is never read</string>
521-
<key>category</key><string>Dead store</string>
521+
<key>category</key><string>Unused code</string>
522522
<key>type</key><string>Dead initialization</string>
523523
<key>check_name</key><string>deadcode.DeadStores</string>
524524
<!-- This hash is experimental and going to change! -->
@@ -586,7 +586,7 @@
586586
</dict>
587587
</array>
588588
<key>description</key><string>Value stored to &apos;obj5&apos; during its initialization is never read</string>
589-
<key>category</key><string>Dead store</string>
589+
<key>category</key><string>Unused code</string>
590590
<key>type</key><string>Dead initialization</string>
591591
<key>check_name</key><string>deadcode.DeadStores</string>
592592
<!-- This hash is experimental and going to change! -->
@@ -654,7 +654,7 @@
654654
</dict>
655655
</array>
656656
<key>description</key><string>Value stored to &apos;obj6&apos; during its initialization is never read</string>
657-
<key>category</key><string>Dead store</string>
657+
<key>category</key><string>Unused code</string>
658658
<key>type</key><string>Dead initialization</string>
659659
<key>check_name</key><string>deadcode.DeadStores</string>
660660
<!-- This hash is experimental and going to change! -->
@@ -1064,7 +1064,7 @@
10641064
</dict>
10651065
</array>
10661066
<key>description</key><string>Value stored to &apos;cf1&apos; during its initialization is never read</string>
1067-
<key>category</key><string>Dead store</string>
1067+
<key>category</key><string>Unused code</string>
10681068
<key>type</key><string>Dead initialization</string>
10691069
<key>check_name</key><string>deadcode.DeadStores</string>
10701070
<!-- This hash is experimental and going to change! -->
@@ -1132,7 +1132,7 @@
11321132
</dict>
11331133
</array>
11341134
<key>description</key><string>Value stored to &apos;cf2&apos; during its initialization is never read</string>
1135-
<key>category</key><string>Dead store</string>
1135+
<key>category</key><string>Unused code</string>
11361136
<key>type</key><string>Dead initialization</string>
11371137
<key>check_name</key><string>deadcode.DeadStores</string>
11381138
<!-- This hash is experimental and going to change! -->
@@ -1200,7 +1200,7 @@
12001200
</dict>
12011201
</array>
12021202
<key>description</key><string>Value stored to &apos;cf3&apos; during its initialization is never read</string>
1203-
<key>category</key><string>Dead store</string>
1203+
<key>category</key><string>Unused code</string>
12041204
<key>type</key><string>Dead initialization</string>
12051205
<key>check_name</key><string>deadcode.DeadStores</string>
12061206
<!-- This hash is experimental and going to change! -->
@@ -1268,7 +1268,7 @@
12681268
</dict>
12691269
</array>
12701270
<key>description</key><string>Value stored to &apos;cf4&apos; during its initialization is never read</string>
1271-
<key>category</key><string>Dead store</string>
1271+
<key>category</key><string>Unused code</string>
12721272
<key>type</key><string>Dead initialization</string>
12731273
<key>check_name</key><string>deadcode.DeadStores</string>
12741274
<!-- This hash is experimental and going to change! -->

‎clang/test/Analysis/Inputs/expected-plists/plist-output.m.plist

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2169,7 +2169,7 @@
21692169
</dict>
21702170
</array>
21712171
<key>description</key><string>Value stored to &apos;foo&apos; during its initialization is never read</string>
2172-
<key>category</key><string>Dead store</string>
2172+
<key>category</key><string>Unused code</string>
21732173
<key>type</key><string>Dead initialization</string>
21742174
<key>check_name</key><string>deadcode.DeadStores</string>
21752175
<!-- This hash is experimental and going to change! -->
@@ -5654,7 +5654,7 @@
56545654
</dict>
56555655
</array>
56565656
<key>description</key><string>Value stored to &apos;x&apos; is never read</string>
5657-
<key>category</key><string>Dead store</string>
5657+
<key>category</key><string>Unused code</string>
56585658
<key>type</key><string>Dead increment</string>
56595659
<key>check_name</key><string>deadcode.DeadStores</string>
56605660
<!-- This hash is experimental and going to change! -->

‎clang/test/SemaObjC/warn-called-once.m

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1130,4 +1130,32 @@ - (void)test_nil_suppression_3:(int)cond1
11301130
}
11311131
}
11321132

1133+
- (void)test_escape_before_branch:(int)cond
1134+
withCompletion:(void (^)(void))handler {
1135+
if (cond) {
1136+
filler();
1137+
}
1138+
1139+
void (^copiedHandler)(void) = ^{
1140+
handler();
1141+
};
1142+
1143+
if (cond) {
1144+
// no-warning
1145+
handler();
1146+
} else {
1147+
copiedHandler();
1148+
}
1149+
}
1150+
1151+
- (void)test_escape_after_branch:(int)cond
1152+
withCompletion:(void (^)(void))handler {
1153+
if (cond) {
1154+
// no-warning
1155+
handler();
1156+
}
1157+
1158+
escape(handler);
1159+
}
1160+
11331161
@end

0 commit comments

Comments
 (0)