blob: 0352e3a9444660b80c9d00a399725deddbe6f372 (
plain)
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
|
// RUN: %check_clang_tidy %s readability-redundant-control-flow %t
void g(int i);
void j();
void f() {
return;
}
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement at the end of a function with a void return type [readability-redundant-control-flow]
// CHECK-FIXES: {{^}}void f() {{{$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
void g() {
f();
return;
}
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement
// CHECK-FIXES: {{^ }}f();{{$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
void g(int i) {
if (i < 0) {
return;
}
if (i < 10) {
f();
}
}
int h() {
return 1;
}
void j() {
}
void k() {
for (int i = 0; i < 10; ++i) {
continue;
}
}
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement at the end of loop statement
// CHECK-FIXES: {{^}} for (int i = 0; i < 10; ++i) {{{$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
void k2() {
int v[10] = { 0 };
for (auto i : v) {
continue;
}
}
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
// CHECK-FIXES: {{^}} for (auto i : v) {{{$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
void m() {
int i = 0;
do {
++i;
continue;
} while (i < 10);
}
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
// CHECK-FIXES: {{^ do {$}}
// CHECK-FIXES-NEXT: {{^}} ++i;{{$}}
// CHECK-FIXES-NEXT: {{^ *}}} while (i < 10);{{$}}
void p() {
int i = 0;
while (i < 10) {
++i;
continue;
}
}
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
// CHECK-FIXES: {{^}} while (i < 10) {{{$}}
// CHECK-FIXES-NEXT: {{^}} ++i;{{$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
void im_not_dead(int i) {
if (i > 0) {
return;
}
g();
}
void im_still_not_dead(int i) {
for (int j = 0; j < 10; ++j) {
if (i < 10) {
continue;
}
g();
}
}
void im_dead(int i) {
if (i > 0) {
return;
g();
}
g();
}
void im_still_dead(int i) {
for (int j = 0; j < 10; ++j) {
if (i < 10) {
continue;
g();
}
g();
}
}
void void_return() {
return g();
}
void nested_return_unmolested() {
g();
{
g();
return;
}
}
void nested_continue_unmolested() {
for (int i = 0; i < 10; ++i) {
if (i < 5) {
continue;
}
}
}
#define MACRO_RETURN_UNMOLESTED(fn_) \
(fn_)(); \
return
#define MACRO_CONTINUE_UNMOLESTED(x_) \
do { \
for (int i = 0; i < (x_); ++i) { \
continue; \
} \
} while (false)
void macro_return() {
MACRO_RETURN_UNMOLESTED(g);
}
void macro_continue() {
MACRO_CONTINUE_UNMOLESTED(10);
}
#define MACRO_RETURN_ARG(stmt_) \
stmt_
#define MACRO_CONTINUE_ARG(stmt_) \
do { \
for (int i = 0; i < 10; ++i) { \
stmt_; \
} \
} while (false)
void macro_arg_return() {
MACRO_RETURN_ARG(return);
}
void macro_arg_continue() {
MACRO_CONTINUE_ARG(continue);
}
template <typename T>
void template_return(T check) {
if (check < T(0)) {
return;
}
return;
}
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement
// CHECK-FIXES: {{^}} if (check < T(0)) {{{$}}
// CHECK-FIXES-NEXT: {{^ return;$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
template <>
void template_return(int check) {
if (check < 0) {
return;
}
return;
}
// CHECK-MESSAGES: :[[@LINE-2]]:3: warning: redundant return statement
// CHECK-FIXES: {{^}} if (check < 0) {{{$}}
// CHECK-FIXES-NEXT: {{^ return;$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
template <typename T>
void template_loop(T end) {
for (T i = 0; i < end; ++i) {
continue;
}
}
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
// CHECK-FIXES: {{^}} for (T i = 0; i < end; ++i) {{{$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
template <>
void template_loop(int end) {
for (int i = 0; i < end; ++i) {
continue;
}
}
// CHECK-MESSAGES: :[[@LINE-3]]:5: warning: redundant continue statement
// CHECK-FIXES: {{^}} for (int i = 0; i < end; ++i) {{{$}}
// CHECK-FIXES-NEXT: {{^ *}$}}
void call_templates() {
template_return(10);
template_return(10.0f);
template_return(10.0);
template_loop(10);
template_loop(10L);
template_loop(10U);
}
|
