1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
|
// RUN: %check_clang_tidy %s readability-else-after-return %t -- -- -fexceptions -std=c++17
namespace std {
struct string {
string(const char *);
~string();
};
} // namespace std
struct my_exception {
my_exception(const std::string &s);
};
void f(int a) {
if (a > 0)
return;
else // comment-0
// CHECK-MESSAGES: :[[@LINE-1]]:3: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} // comment-0
return;
if (a > 0) {
return;
} else { // comment-1
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-1
return;
}
if (a > 0) {
f(0);
if (a > 10)
return;
} else {
return;
}
if (a > 0)
f(0);
else if (a > 10)
return;
else // comment-2
// CHECK-FIXES-NOT: {{^}} // comment-2
f(0);
if (a > 0)
if (a < 10)
return;
else // comment-3
// CHECK-FIXES-NOT: {{^}} // comment-3
f(0);
else
if (a > 10)
return;
else // comment-4
// CHECK-FIXES-NOT: {{^}} // comment-4
f(0);
if (a > 0) {
if (a < 10)
return;
else // comment-5
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} // comment-5
f(0);
} else {
if (a > 10)
return;
else // comment-6
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} // comment-6
f(0);
}
}
void foo() {
for (unsigned x = 0; x < 42; ++x) {
if (x) {
continue;
} else { // comment-7
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: do not use 'else' after 'continue'
// CHECK-FIXES: {{^}} } // comment-7
x++;
}
if (x) {
break;
} else { // comment-8
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: do not use 'else' after 'break'
// CHECK-FIXES: {{^}} } // comment-8
x++;
}
if (x) {
throw 42;
} else { // comment-9
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: do not use 'else' after 'throw'
// CHECK-FIXES: {{^}} } // comment-9
x++;
}
if (x) {
throw my_exception("foo");
} else { // comment-10
// CHECK-MESSAGES: :[[@LINE-1]]:7: warning: do not use 'else' after 'throw'
// CHECK-FIXES: {{^}} } // comment-10
x++;
}
}
}
int g();
int h(int);
int declInConditionUsedInElse() {
if (int X = g()) { // comment-11
// CHECK-FIXES: {{^}} int X = g();
// CHECK-FIXES-NEXT: {{^}}if (X) { // comment-11
return X;
} else { // comment-11
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-11
return h(X);
}
}
int declInConditionUnusedInElse() {
if (int X = g()) {
return h(X);
} else { // comment-12
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-12
return 0;
}
}
int varInitAndCondition() {
if (int X = g(); X != 0) { // comment-13
// CHECK-FIXES: {{^}} int X = g();
// CHECK-FIXES-NEXT: {{^}}if ( X != 0) { // comment-13
return X;
} else { // comment-13
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-13
return h(X);
}
}
int varInitAndConditionUnusedInElse() {
if (int X = g(); X != 0) {
return X;
} else { // comment-14
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-14
return 0;
}
}
int initAndCondition() {
int X;
if (X = g(); X != 0) {
return X;
} else { // comment-15
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-15
return h(X);
}
}
int varInitAndConditionUnusedInElseWithDecl() {
int Y = g();
if (int X = g(); X != 0) {
return X;
} else { // comment-16
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES-NOT: {{^}} } //comment-16
int Y = g();
h(Y);
}
return Y;
}
int varInitAndCondVarUsedInElse() {
if (int X = g(); int Y = g()) { // comment-17
// CHECK-FIXES: {{^}} int X = g();
// CHECK-FIXES-NEXT: {{^}}int Y = g();
// CHECK-FIXES-NEXT: {{^}}if ( Y) { // comment-17
return X ? X : Y;
} else { // comment-17
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-17
return X ? X : h(Y);
}
}
int lifeTimeExtensionTests(int a) {
if (a > 0) {
return a;
} else {
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
int b = 0;
h(b);
}
if (int b = a; (b & 1) == 0) {
return a;
} else {
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
b++;
}
if (int b = a; b > 1) { // comment-18
// CHECK-FIXES: {{^}} int b = a;
// CHECK-FIXES-NEXT: {{^}}if ( b > 1) { // comment-18
return a;
} else { // comment-18
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
// CHECK-FIXES: {{^}} } // comment-18
return b;
}
}
void test_B44745() {
// This is the actual minimum test case for the crash in bug 44745. We aren't
// too worried about the warning or fix here, more we don't want a crash.
// CHECK-MESSAGES: :[[@LINE+3]]:5: warning: do not use 'else' after 'return' [readability-else-after-return]
if (auto X = false) {
return;
} else {
for (;;) {
}
}
return;
}
void testPPConditionals() {
// These cases the return isn't inside the conditional so diagnose as normal.
if (true) {
return;
#if 1
#endif
} else {
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
return;
}
if (true) {
#if 1
#endif
return;
} else {
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
return;
}
// No return here in the AST, no special handling needed.
if (true) {
#if 0
return;
#endif
} else {
return;
}
// Return here is inside a preprocessor conditional block, ignore this case.
if (true) {
#if 1
return;
#endif
} else {
return;
}
// These cases, same as above but with an #else block.
if (true) {
#if 1
return;
#else
#endif
} else {
return;
}
if (true) {
#if 0
#else
return;
#endif
} else {
return;
}
// Ensure it can handle macros.
#define RETURN return
if (true) {
#if 1
RETURN;
#endif
} else {
return;
}
#define ELSE else
if (true) {
#if 1
return;
#endif
}
ELSE {
return;
}
// Whole statement is in a conditional block so diagnose as normal.
#if 1
if (true) {
return;
} else {
// CHECK-MESSAGES: :[[@LINE-1]]:5: warning: do not use 'else' after 'return'
return;
}
#endif
}
|
