Skip to content

Commit f0c90df

Browse files
feyruzbfeyruzb
authored
Rename 'free' in warning messages to 'release' (#150935)
Changed the warning message: - **From**: 'Attempt to free released memory' **To**: 'Attempt to release already released memory' - **From**: 'Attempt to free non-owned memory' **To**: 'Attempt to release non-owned memory' - **From**: 'Use of memory after it is freed' **To**: 'Use of memory after it is released' All connected tests and their expectations have been changed accordingly. Inspired by [this PR](#147542 (comment))
1 parent 837b2d4 commit f0c90df

28 files changed

+127
-127
lines changed

‎clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer-config.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ void af2() {
1616
void *p = my_malloc(12);
1717
my_free(p);
1818
free(p);
19-
// CHECK: warning: Attempt to free released memory [clang-analyzer-unix.Malloc]
19+
// CHECK: warning: Attempt to release already released memory [clang-analyzer-unix.Malloc]
2020
}

‎clang-tools-extra/test/clang-tidy/infrastructure/static-analyzer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@ void f() {
77
int *p = new int(42);
88
delete p;
99
delete p;
10-
// CHECK: warning: Attempt to free released memory [clang-analyzer-cplusplus.NewDelete]
10+
// CHECK: warning: Attempt to release already released memory [clang-analyzer-cplusplus.NewDelete]
1111
}
1212

1313
void g() {
1414
void *q = malloc(132);
1515
free(q);
1616
free(q);
17-
// CHECK: warning: Attempt to free released memory [clang-analyzer-unix.Malloc]
17+
// CHECK: warning: Attempt to release already released memory [clang-analyzer-unix.Malloc]
1818
}

‎clang/docs/analyzer/checkers/unix_malloc_example.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
void test() {
33
int *p = malloc(1);
44
free(p);
5-
free(p); // warn: attempt to free released memory
5+
free(p); // warn: attempt to release already released memory
66
}
77

88
void test() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2693,7 +2693,7 @@ void MallocChecker::HandleUseAfterFree(CheckerContext &C, SourceRange Range,
26932693
Frontend->UseFreeBug,
26942694
AF.Kind == AF_InnerBuffer
26952695
? "Inner pointer of container used after re/deallocation"
2696-
: "Use of memory after it is freed",
2696+
: "Use of memory after it is released",
26972697
N);
26982698

26992699
R->markInteresting(Sym);
@@ -2721,8 +2721,8 @@ void MallocChecker::HandleDoubleFree(CheckerContext &C, SourceRange Range,
27212721
if (ExplodedNode *N = C.generateErrorNode()) {
27222722
auto R = std::make_unique<PathSensitiveBugReport>(
27232723
Frontend->DoubleFreeBug,
2724-
(Released ? "Attempt to free released memory"
2725-
: "Attempt to free non-owned memory"),
2724+
(Released ? "Attempt to release already released memory"
2725+
: "Attempt to release non-owned memory"),
27262726
N);
27272727
if (Range.isValid())
27282728
R->addRange(Range);

‎clang/test/Analysis/Inputs/expected-plists/NewDelete-path-notes.cpp.plist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@
3333
</array>
3434
<key>depth</key><integer>0</integer>
3535
<key>extended_message</key>
36-
<string>Attempt to free released memory</string>
36+
<string>Attempt to release already released memory</string>
3737
<key>message</key>
38-
<string>Attempt to free released memory</string>
38+
<string>Attempt to release already released memory</string>
3939
</dict>
4040
<dict>
4141
<key>kind</key><string>control</string>
@@ -232,7 +232,7 @@
232232
</array>
233233
</dict>
234234
</array>
235-
<key>description</key><string>Attempt to free released memory</string>
235+
<key>description</key><string>Attempt to release already released memory</string>
236236
<key>category</key><string>Memory error</string>
237237
<key>type</key><string>Double free</string>
238238
<key>check_name</key><string>cplusplus.NewDelete</string>
@@ -456,12 +456,12 @@
456456
</array>
457457
<key>depth</key><integer>0</integer>
458458
<key>extended_message</key>
459-
<string>Attempt to free released memory</string>
459+
<string>Attempt to release already released memory</string>
460460
<key>message</key>
461-
<string>Attempt to free released memory</string>
461+
<string>Attempt to release already released memory</string>
462462
</dict>
463463
</array>
464-
<key>description</key><string>Attempt to free released memory</string>
464+
<key>description</key><string>Attempt to release already released memory</string>
465465
<key>category</key><string>Memory error</string>
466466
<key>type</key><string>Double free</string>
467467
<key>check_name</key><string>cplusplus.NewDelete</string>

‎clang/test/Analysis/Inputs/expected-plists/malloc-plist.c.plist

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1725,12 +1725,12 @@
17251725
</array>
17261726
<key>depth</key><integer>0</integer>
17271727
<key>extended_message</key>
1728-
<string>Use of memory after it is freed</string>
1728+
<string>Use of memory after it is released</string>
17291729
<key>message</key>
1730-
<string>Use of memory after it is freed</string>
1730+
<string>Use of memory after it is released</string>
17311731
</dict>
17321732
</array>
1733-
<key>description</key><string>Use of memory after it is freed</string>
1733+
<key>description</key><string>Use of memory after it is released</string>
17341734
<key>category</key><string>Memory error</string>
17351735
<key>type</key><string>Use-after-free</string>
17361736
<key>check_name</key><string>unix.Malloc</string>
@@ -2985,12 +2985,12 @@
29852985
</array>
29862986
<key>depth</key><integer>0</integer>
29872987
<key>extended_message</key>
2988-
<string>Use of memory after it is freed</string>
2988+
<string>Use of memory after it is released</string>
29892989
<key>message</key>
2990-
<string>Use of memory after it is freed</string>
2990+
<string>Use of memory after it is released</string>
29912991
</dict>
29922992
</array>
2993-
<key>description</key><string>Use of memory after it is freed</string>
2993+
<key>description</key><string>Use of memory after it is released</string>
29942994
<key>category</key><string>Memory error</string>
29952995
<key>type</key><string>Use-after-free</string>
29962996
<key>check_name</key><string>unix.Malloc</string>

‎clang/test/Analysis/Inputs/overloaded-delete-in-header.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ void DeleteInHeader::operator delete(void *ptr) {
1212

1313
::operator delete(ptr);
1414

15-
self->data = 2; // expected-warning {{Use of memory after it is freed [cplusplus.NewDelete]}}
15+
self->data = 2; // expected-warning {{Use of memory after it is released [cplusplus.NewDelete]}}
1616
}
1717

1818
#endif // OVERLOADED_DELETE_IN_SYSTEM_HEADER

‎clang/test/Analysis/Malloc+MismatchedDeallocator+NewDelete.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
void testMallocDoubleFree() {
1010
int *p = (int *)malloc(sizeof(int));
1111
free(p);
12-
free(p); // expected-warning{{Attempt to free released memory}}
12+
free(p); // expected-warning{{Attempt to release already released memory}}
1313
}
1414

1515
void testMallocLeak() {
@@ -19,7 +19,7 @@ void testMallocLeak() {
1919
void testMallocUseAfterFree() {
2020
int *p = (int *)malloc(sizeof(int));
2121
free(p);
22-
int j = *p; // expected-warning{{Use of memory after it is freed}}
22+
int j = *p; // expected-warning{{Use of memory after it is released}}
2323
}
2424

2525
void testMallocBadFree() {
@@ -46,7 +46,7 @@ void testMismatchedDeallocator() {
4646
void testNewDoubleFree() {
4747
int *p = new int;
4848
delete p;
49-
delete p; // expected-warning{{Attempt to free released memory}}
49+
delete p; // expected-warning{{Attempt to release already released memory}}
5050
}
5151

5252
void testNewLeak() {
@@ -59,7 +59,7 @@ void testNewLeak() {
5959
void testNewUseAfterFree() {
6060
int *p = (int *)operator new(0);
6161
delete p;
62-
int j = *p; // expected-warning{{Use of memory after it is freed}}
62+
int j = *p; // expected-warning{{Use of memory after it is released}}
6363
}
6464

6565
void testNewBadFree() {
@@ -95,7 +95,7 @@ void testShouldReportDoubleFreeNotMismatched() {
9595
int *p = (int*)malloc(sizeof(int)*4);
9696
globalPtr = p;
9797
free(p);
98-
delete globalPtr; // expected-warning {{Attempt to free released memory}}
98+
delete globalPtr; // expected-warning {{Attempt to release already released memory}}
9999
}
100100
int *allocIntArray(unsigned c) {
101101
return new int[c];

‎clang/test/Analysis/NewDelete-checker-test.cpp

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,52 +155,52 @@ void g(SomeClass &c, ...);
155155
void testUseFirstArgAfterDelete() {
156156
int *p = new int;
157157
delete p;
158-
f(p); // newdelete-warning{{Use of memory after it is freed}}
158+
f(p); // newdelete-warning{{Use of memory after it is released}}
159159
}
160160

161161
void testUseMiddleArgAfterDelete(int *p) {
162162
delete p;
163-
f(0, p); // newdelete-warning{{Use of memory after it is freed}}
163+
f(0, p); // newdelete-warning{{Use of memory after it is released}}
164164
}
165165

166166
void testUseLastArgAfterDelete(int *p) {
167167
delete p;
168-
f(0, 0, p); // newdelete-warning{{Use of memory after it is freed}}
168+
f(0, 0, p); // newdelete-warning{{Use of memory after it is released}}
169169
}
170170

171171
void testUseSeveralArgsAfterDelete(int *p) {
172172
delete p;
173-
f(p, p, p); // newdelete-warning{{Use of memory after it is freed}}
173+
f(p, p, p); // newdelete-warning{{Use of memory after it is released}}
174174
}
175175

176176
void testUseRefArgAfterDelete(SomeClass &c) {
177177
delete &c;
178-
g(c); // newdelete-warning{{Use of memory after it is freed}}
178+
g(c); // newdelete-warning{{Use of memory after it is released}}
179179
}
180180

181181
void testVariadicArgAfterDelete() {
182182
SomeClass c;
183183
int *p = new int;
184184
delete p;
185-
g(c, 0, p); // newdelete-warning{{Use of memory after it is freed}}
185+
g(c, 0, p); // newdelete-warning{{Use of memory after it is released}}
186186
}
187187

188188
void testUseMethodArgAfterDelete(int *p) {
189189
SomeClass *c = new SomeClass;
190190
delete p;
191-
c->f(p); // newdelete-warning{{Use of memory after it is freed}}
191+
c->f(p); // newdelete-warning{{Use of memory after it is released}}
192192
}
193193

194194
void testUseThisAfterDelete() {
195195
SomeClass *c = new SomeClass;
196196
delete c;
197-
c->f(0); // newdelete-warning{{Use of memory after it is freed}}
197+
c->f(0); // newdelete-warning{{Use of memory after it is released}}
198198
}
199199

200200
void testDoubleDelete() {
201201
int *p = new int;
202202
delete p;
203-
delete p; // newdelete-warning{{Attempt to free released memory}}
203+
delete p; // newdelete-warning{{Attempt to release already released memory}}
204204
}
205205

206206
void testExprDeleteArg() {
@@ -412,7 +412,7 @@ class DerefClass{
412412
void testDoubleDeleteClassInstance() {
413413
DerefClass *foo = new DerefClass();
414414
delete foo;
415-
delete foo; // newdelete-warning {{Attempt to free released memory}}
415+
delete foo; // newdelete-warning {{Attempt to release already released memory}}
416416
}
417417

418418
class EmptyClass{
@@ -424,7 +424,7 @@ class EmptyClass{
424424
void testDoubleDeleteEmptyClass() {
425425
EmptyClass *foo = new EmptyClass();
426426
delete foo;
427-
delete foo; // newdelete-warning {{Attempt to free released memory}}
427+
delete foo; // newdelete-warning {{Attempt to release already released memory}}
428428
}
429429

430430
struct Base {

‎clang/test/Analysis/NewDelete-intersections.mm

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -78,11 +78,11 @@ void testObjcFreeNewed() {
7878
void testFreeAfterDelete() {
7979
int *p = new int;
8080
delete p;
81-
free(p); // newdelete-warning{{Use of memory after it is freed}}
81+
free(p); // newdelete-warning{{Use of memory after it is released}}
8282
}
8383

8484
void testStandardPlacementNewAfterDelete() {
8585
int *p = new int;
8686
delete p;
87-
p = new (p) int; // newdelete-warning{{Use of memory after it is freed}}
87+
p = new (p) int; // newdelete-warning{{Use of memory after it is released}}
8888
}

0 commit comments

Comments
 (0)