Skip to content

Commit 387fa84

Browse files
GuillaumeGomezGuillaumeGomez
authored
Rollup merge of #45951 - CrockAgile:master, r=michaelwoerister
incr: Update hash tests to use `except`-style checking Part of #44924 r? @michaelwoerister
2 parents 1410d56 + d1a83c6 commit 387fa84

File tree

5 files changed

+75
-145
lines changed

5 files changed

+75
-145
lines changed

‎src/test/incremental/hashes/exported_vs_not.rs‎

Lines changed: 6 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,8 @@ pub fn body_not_exported_to_metadata() -> u32 {
2626
}
2727

2828
#[cfg(not(cfail1))]
29-
#[rustc_clean(label="Hir", cfg="cfail2")]
30-
#[rustc_clean(label="Hir", cfg="cfail3")]
31-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
32-
#[rustc_clean(label="HirBody", cfg="cfail3")]
29+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
30+
#[rustc_clean(cfg="cfail3")]
3331
#[rustc_metadata_clean(cfg="cfail2")]
3432
#[rustc_metadata_clean(cfg="cfail3")]
3533
pub fn body_not_exported_to_metadata() -> u32 {
@@ -49,10 +47,8 @@ pub fn body_exported_to_metadata_because_of_inline() -> u32 {
4947
}
5048

5149
#[cfg(not(cfail1))]
52-
#[rustc_clean(label="Hir", cfg="cfail2")]
53-
#[rustc_clean(label="Hir", cfg="cfail3")]
54-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
55-
#[rustc_clean(label="HirBody", cfg="cfail3")]
50+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
51+
#[rustc_clean(cfg="cfail3")]
5652
#[rustc_metadata_dirty(cfg="cfail2")]
5753
#[rustc_metadata_clean(cfg="cfail3")]
5854
#[inline]
@@ -73,10 +69,8 @@ pub fn body_exported_to_metadata_because_of_generic() -> u32 {
7369
}
7470

7571
#[cfg(not(cfail1))]
76-
#[rustc_clean(label="Hir", cfg="cfail2")]
77-
#[rustc_clean(label="Hir", cfg="cfail3")]
78-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
79-
#[rustc_clean(label="HirBody", cfg="cfail3")]
72+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
73+
#[rustc_clean(cfg="cfail3")]
8074
#[rustc_metadata_dirty(cfg="cfail2")]
8175
#[rustc_metadata_clean(cfg="cfail3")]
8276
#[inline]

‎src/test/incremental/hashes/if_expressions.rs‎

Lines changed: 20 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,8 @@ pub fn change_condition(x: bool) -> u32 {
3636
}
3737

3838
#[cfg(not(cfail1))]
39-
#[rustc_clean(label="Hir", cfg="cfail2")]
40-
#[rustc_clean(label="Hir", cfg="cfail3")]
41-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
42-
#[rustc_clean(label="HirBody", cfg="cfail3")]
39+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
40+
#[rustc_clean(cfg="cfail3")]
4341
#[rustc_metadata_clean(cfg="cfail2")]
4442
#[rustc_metadata_clean(cfg="cfail3")]
4543
pub fn change_condition(x: bool) -> u32 {
@@ -61,10 +59,8 @@ pub fn change_then_branch(x: bool) -> u32 {
6159
}
6260

6361
#[cfg(not(cfail1))]
64-
#[rustc_clean(label="Hir", cfg="cfail2")]
65-
#[rustc_clean(label="Hir", cfg="cfail3")]
66-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
67-
#[rustc_clean(label="HirBody", cfg="cfail3")]
62+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
63+
#[rustc_clean(cfg="cfail3")]
6864
#[rustc_metadata_clean(cfg="cfail2")]
6965
#[rustc_metadata_clean(cfg="cfail3")]
7066
pub fn change_then_branch(x: bool) -> u32 {
@@ -88,10 +84,8 @@ pub fn change_else_branch(x: bool) -> u32 {
8884
}
8985

9086
#[cfg(not(cfail1))]
91-
#[rustc_clean(label="Hir", cfg="cfail2")]
92-
#[rustc_clean(label="Hir", cfg="cfail3")]
93-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
94-
#[rustc_clean(label="HirBody", cfg="cfail3")]
87+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
88+
#[rustc_clean(cfg="cfail3")]
9589
#[rustc_metadata_clean(cfg="cfail2")]
9690
#[rustc_metadata_clean(cfg="cfail3")]
9791
pub fn change_else_branch(x: bool) -> u32 {
@@ -110,24 +104,22 @@ pub fn add_else_branch(x: bool) -> u32 {
110104
let mut ret = 1;
111105

112106
if x {
113-
ret += 1;
107+
ret = 2;
114108
}
115109

116110
ret
117111
}
118112

119113
#[cfg(not(cfail1))]
120-
#[rustc_clean(label="Hir", cfg="cfail2")]
121-
#[rustc_clean(label="Hir", cfg="cfail3")]
122-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
123-
#[rustc_clean(label="HirBody", cfg="cfail3")]
114+
#[rustc_clean(cfg="cfail2", except="HirBody,TypeckTables")]
115+
#[rustc_clean(cfg="cfail3")]
124116
#[rustc_metadata_clean(cfg="cfail2")]
125117
#[rustc_metadata_clean(cfg="cfail3")]
126118
pub fn add_else_branch(x: bool) -> u32 {
127119
let mut ret = 1;
128120

129121
if x {
130-
ret += 1;
122+
ret = 2;
131123
} else {
132124
}
133125

@@ -147,10 +139,8 @@ pub fn change_condition_if_let(x: Option<u32>) -> u32 {
147139
}
148140

149141
#[cfg(not(cfail1))]
150-
#[rustc_clean(label="Hir", cfg="cfail2")]
151-
#[rustc_clean(label="Hir", cfg="cfail3")]
152-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
153-
#[rustc_clean(label="HirBody", cfg="cfail3")]
142+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
143+
#[rustc_clean(cfg="cfail3")]
154144
#[rustc_metadata_clean(cfg="cfail2")]
155145
#[rustc_metadata_clean(cfg="cfail3")]
156146
pub fn change_condition_if_let(x: Option<u32>) -> u32 {
@@ -174,10 +164,8 @@ pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
174164
}
175165

176166
#[cfg(not(cfail1))]
177-
#[rustc_clean(label="Hir", cfg="cfail2")]
178-
#[rustc_clean(label="Hir", cfg="cfail3")]
179-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
180-
#[rustc_clean(label="HirBody", cfg="cfail3")]
167+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized,TypeckTables")]
168+
#[rustc_clean(cfg="cfail3")]
181169
#[rustc_metadata_clean(cfg="cfail2")]
182170
#[rustc_metadata_clean(cfg="cfail3")]
183171
pub fn change_then_branch_if_let(x: Option<u32>) -> u32 {
@@ -201,10 +189,8 @@ pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
201189
}
202190

203191
#[cfg(not(cfail1))]
204-
#[rustc_clean(label="Hir", cfg="cfail2")]
205-
#[rustc_clean(label="Hir", cfg="cfail3")]
206-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
207-
#[rustc_clean(label="HirBody", cfg="cfail3")]
192+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
193+
#[rustc_clean(cfg="cfail3")]
208194
#[rustc_metadata_clean(cfg="cfail2")]
209195
#[rustc_metadata_clean(cfg="cfail3")]
210196
pub fn change_else_branch_if_let(x: Option<u32>) -> u32 {
@@ -223,24 +209,22 @@ pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
223209
let mut ret = 1;
224210

225211
if let Some(x) = x {
226-
ret += x;
212+
ret = x;
227213
}
228214

229215
ret
230216
}
231217

232218
#[cfg(not(cfail1))]
233-
#[rustc_clean(label="Hir", cfg="cfail2")]
234-
#[rustc_clean(label="Hir", cfg="cfail3")]
235-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
236-
#[rustc_clean(label="HirBody", cfg="cfail3")]
219+
#[rustc_clean(cfg="cfail2", except="HirBody,TypeckTables")]
220+
#[rustc_clean(cfg="cfail3")]
237221
#[rustc_metadata_clean(cfg="cfail2")]
238222
#[rustc_metadata_clean(cfg="cfail3")]
239223
pub fn add_else_branch_if_let(x: Option<u32>) -> u32 {
240224
let mut ret = 1;
241225

242226
if let Some(x) = x {
243-
ret += x;
227+
ret = x;
244228
} else {
245229
}
246230

‎src/test/incremental/hashes/indexing_expressions.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111

1212
// This test case tests the incremental compilation hash (ICH) implementation
13-
// for closure expression.
13+
// for indexing expression.
1414

1515
// The general pattern followed here is: Change one thing between rev1 and rev2
1616
// and make sure that the hash has changed, then change nothing between rev2 and

‎src/test/incremental/hashes/panic_exprs.rs‎

Lines changed: 22 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,8 @@ pub fn indexing(slice: &[u8]) -> u8 {
3434
}
3535

3636
#[cfg(not(cfail1))]
37-
#[rustc_clean(label="Hir", cfg="cfail2")]
38-
#[rustc_clean(label="Hir", cfg="cfail3")]
39-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
40-
#[rustc_clean(label="HirBody", cfg="cfail3")]
37+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
38+
#[rustc_clean(cfg="cfail3")]
4139
#[rustc_metadata_clean(cfg="cfail2")]
4240
#[rustc_metadata_clean(cfg="cfail3")]
4341
pub fn indexing(slice: &[u8]) -> u8 {
@@ -52,10 +50,8 @@ pub fn arithmetic_overflow_plus(val: i32) -> i32 {
5250
}
5351

5452
#[cfg(not(cfail1))]
55-
#[rustc_clean(label="Hir", cfg="cfail2")]
56-
#[rustc_clean(label="Hir", cfg="cfail3")]
57-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
58-
#[rustc_clean(label="HirBody", cfg="cfail3")]
53+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
54+
#[rustc_clean(cfg="cfail3")]
5955
#[rustc_metadata_clean(cfg="cfail2")]
6056
#[rustc_metadata_clean(cfg="cfail3")]
6157
pub fn arithmetic_overflow_plus(val: i32) -> i32 {
@@ -70,10 +66,8 @@ pub fn arithmetic_overflow_minus(val: i32) -> i32 {
7066
}
7167

7268
#[cfg(not(cfail1))]
73-
#[rustc_clean(label="Hir", cfg="cfail2")]
74-
#[rustc_clean(label="Hir", cfg="cfail3")]
75-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
76-
#[rustc_clean(label="HirBody", cfg="cfail3")]
69+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
70+
#[rustc_clean(cfg="cfail3")]
7771
#[rustc_metadata_clean(cfg="cfail2")]
7872
#[rustc_metadata_clean(cfg="cfail3")]
7973
pub fn arithmetic_overflow_minus(val: i32) -> i32 {
@@ -88,10 +82,8 @@ pub fn arithmetic_overflow_mult(val: i32) -> i32 {
8882
}
8983

9084
#[cfg(not(cfail1))]
91-
#[rustc_clean(label="Hir", cfg="cfail2")]
92-
#[rustc_clean(label="Hir", cfg="cfail3")]
93-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
94-
#[rustc_clean(label="HirBody", cfg="cfail3")]
85+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
86+
#[rustc_clean(cfg="cfail3")]
9587
#[rustc_metadata_clean(cfg="cfail2")]
9688
#[rustc_metadata_clean(cfg="cfail3")]
9789
pub fn arithmetic_overflow_mult(val: i32) -> i32 {
@@ -106,10 +98,8 @@ pub fn arithmetic_overflow_negation(val: i32) -> i32 {
10698
}
10799

108100
#[cfg(not(cfail1))]
109-
#[rustc_clean(label="Hir", cfg="cfail2")]
110-
#[rustc_clean(label="Hir", cfg="cfail3")]
111-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
112-
#[rustc_clean(label="HirBody", cfg="cfail3")]
101+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
102+
#[rustc_clean(cfg="cfail3")]
113103
#[rustc_metadata_clean(cfg="cfail2")]
114104
#[rustc_metadata_clean(cfg="cfail3")]
115105
pub fn arithmetic_overflow_negation(val: i32) -> i32 {
@@ -124,10 +114,8 @@ pub fn division_by_zero(val: i32) -> i32 {
124114
}
125115

126116
#[cfg(not(cfail1))]
127-
#[rustc_clean(label="Hir", cfg="cfail2")]
128-
#[rustc_clean(label="Hir", cfg="cfail3")]
129-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
130-
#[rustc_clean(label="HirBody", cfg="cfail3")]
117+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
118+
#[rustc_clean(cfg="cfail3")]
131119
#[rustc_metadata_clean(cfg="cfail2")]
132120
#[rustc_metadata_clean(cfg="cfail3")]
133121
pub fn division_by_zero(val: i32) -> i32 {
@@ -141,10 +129,8 @@ pub fn mod_by_zero(val: i32) -> i32 {
141129
}
142130

143131
#[cfg(not(cfail1))]
144-
#[rustc_clean(label="Hir", cfg="cfail2")]
145-
#[rustc_clean(label="Hir", cfg="cfail3")]
146-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
147-
#[rustc_clean(label="HirBody", cfg="cfail3")]
132+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
133+
#[rustc_clean(cfg="cfail3")]
148134
#[rustc_metadata_clean(cfg="cfail2")]
149135
#[rustc_metadata_clean(cfg="cfail3")]
150136
pub fn mod_by_zero(val: i32) -> i32 {
@@ -159,10 +145,8 @@ pub fn shift_left(val: i32, shift: usize) -> i32 {
159145
}
160146

161147
#[cfg(not(cfail1))]
162-
#[rustc_clean(label="Hir", cfg="cfail2")]
163-
#[rustc_clean(label="Hir", cfg="cfail3")]
164-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
165-
#[rustc_clean(label="HirBody", cfg="cfail3")]
148+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
149+
#[rustc_clean(cfg="cfail3")]
166150
#[rustc_metadata_clean(cfg="cfail2")]
167151
#[rustc_metadata_clean(cfg="cfail3")]
168152
pub fn shift_left(val: i32, shift: usize) -> i32 {
@@ -177,10 +161,8 @@ pub fn shift_right(val: i32, shift: usize) -> i32 {
177161
}
178162

179163
#[cfg(not(cfail1))]
180-
#[rustc_clean(label="Hir", cfg="cfail2")]
181-
#[rustc_clean(label="Hir", cfg="cfail3")]
182-
#[rustc_dirty(label="HirBody", cfg="cfail2")]
183-
#[rustc_clean(label="HirBody", cfg="cfail3")]
164+
#[rustc_clean(cfg="cfail2", except="HirBody,MirValidated,MirOptimized")]
165+
#[rustc_clean(cfg="cfail3")]
184166
#[rustc_metadata_clean(cfg="cfail2")]
185167
#[rustc_metadata_clean(cfg="cfail3")]
186168
pub fn shift_right(val: i32, shift: usize) -> i32 {
@@ -197,10 +179,8 @@ pub fn bitwise(val: i32) -> i32 {
197179
}
198180

199181
#[cfg(not(cfail1))]
200-
#[rustc_clean(label="Hir", cfg="cfail2")]
201-
#[rustc_clean(label="Hir", cfg="cfail3")]
202-
#[rustc_clean(label="HirBody", cfg="cfail2")]
203-
#[rustc_clean(label="HirBody", cfg="cfail3")]
182+
#[rustc_clean(cfg="cfail2")]
183+
#[rustc_clean(cfg="cfail3")]
204184
#[rustc_metadata_clean(cfg="cfail2")]
205185
#[rustc_metadata_clean(cfg="cfail3")]
206186
pub fn bitwise(val: i32) -> i32 {
@@ -215,10 +195,8 @@ pub fn logical(val1: bool, val2: bool, val3: bool) -> bool {
215195
}
216196

217197
#[cfg(not(cfail1))]
218-
#[rustc_clean(label="Hir", cfg="cfail2")]
219-
#[rustc_clean(label="Hir", cfg="cfail3")]
220-
#[rustc_clean(label="HirBody", cfg="cfail2")]
221-
#[rustc_clean(label="HirBody", cfg="cfail3")]
198+
#[rustc_clean(cfg="cfail2")]
199+
#[rustc_clean(cfg="cfail3")]
222200
#[rustc_metadata_clean(cfg="cfail2")]
223201
#[rustc_metadata_clean(cfg="cfail3")]
224202
pub fn logical(val1: bool, val2: bool, val3: bool) -> bool {

0 commit comments

Comments
 (0)