Skip to content

Commit d408a06

Browse files
nikomatsakisnikomatsakis
committed
make blame_span deterministic
1 parent 637880f commit d408a06

11 files changed

+71
-52
lines changed

‎src/librustc_mir/borrow_check/nll/region_infer/mod.rs

Lines changed: 39 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -869,35 +869,50 @@ impl<'tcx> RegionInferenceContext<'tcx> {
869869
// be obvious to the user -- not to mention the naive notion
870870
// of dependencies, which doesn't account for the locations of
871871
// contraints at all. But it will do for now.
872-
for constraint in &self.constraints {
873-
if constraint.sub == fr2 && influenced_fr1[constraint.sup] {
874-
return constraint.span;
875-
}
876-
}
877-
878-
bug!(
879-
"could not find any constraint to blame for {:?}: {:?}",
880-
fr1,
881-
fr2
882-
);
872+
let relevant_constraint = self.constraints
873+
.iter()
874+
.filter_map(|constraint| {
875+
if constraint.sub != fr2 {
876+
None
877+
} else {
878+
influenced_fr1[constraint.sup]
879+
.map(|distance| (distance, constraint.span))
880+
}
881+
})
882+
.min() // constraining fr1 with fewer hops *ought* to be more obvious
883+
.map(|(_dist, span)| span);
884+
885+
relevant_constraint.unwrap_or_else(|| {
886+
bug!(
887+
"could not find any constraint to blame for {:?}: {:?}",
888+
fr1,
889+
fr2
890+
);
891+
})
883892
}
884893

885894
/// Finds all regions whose values `'a` may depend on in some way.
886-
/// Basically if there exists a constraint `'a: 'b @ P`, then `'b`
887-
/// and `dependencies('b)` will be in the final set.
895+
/// For each region, returns either `None` (does not influence
896+
/// `'a`) or `Some(d)` which indicates that it influences `'a`
897+
/// with distinct `d` (minimum number of edges that must be
898+
/// traversed).
888899
///
889900
/// Used during error reporting, extremely naive and inefficient.
890-
fn dependencies(&self, r0: RegionVid) -> IndexVec<RegionVid, bool> {
891-
let mut result_set = IndexVec::from_elem(false, &self.definitions);
901+
fn dependencies(&self, r0: RegionVid) -> IndexVec<RegionVid, Option<usize>> {
902+
let mut result_set = IndexVec::from_elem(None, &self.definitions);
892903
let mut changed = true;
893-
result_set[r0] = true;
904+
result_set[r0] = Some(0); // distance 0 from `r0`
894905

895906
while changed {
896907
changed = false;
897908
for constraint in &self.constraints {
898-
if result_set[constraint.sup] {
899-
if !result_set[constraint.sub] {
900-
result_set[constraint.sub] = true;
909+
if let Some(n) = result_set[constraint.sup] {
910+
let m = n + 1;
911+
if result_set[constraint.sub]
912+
.map(|distance| m < distance)
913+
.unwrap_or(true)
914+
{
915+
result_set[constraint.sub] = Some(m);
901916
changed = true;
902917
}
903918
}
@@ -1046,13 +1061,16 @@ impl<'gcx, 'tcx> ClosureRegionRequirementsExt<'gcx, 'tcx> for ClosureRegionRequi
10461061
value: &T,
10471062
) -> T
10481063
where
1049-
T: TypeFoldable<'tcx>
1064+
T: TypeFoldable<'tcx>,
10501065
{
10511066
infcx.tcx.fold_regions(value, &mut false, |r, _depth| {
10521067
if let ty::ReClosureBound(vid) = r {
10531068
closure_mapping[*vid]
10541069
} else {
1055-
bug!("subst_closure_mapping: encountered non-closure bound free region {:?}", r)
1070+
bug!(
1071+
"subst_closure_mapping: encountered non-closure bound free region {:?}",
1072+
r
1073+
)
10561074
}
10571075
})
10581076
}

‎src/test/compile-fail/mir_check_cast_closure.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@
1414

1515
fn bar<'a, 'b>() -> fn(&'a u32, &'b u32) -> &'a u32 {
1616
let g: fn(_, _) -> _ = |_x, y| y;
17+
//~^ ERROR free region `'b` does not outlive free region `'a`
1718
g
1819
//~^ WARNING not reporting region error due to -Znll
19-
//~| ERROR free region `'b` does not outlive free region `'a`
2020
}
2121

2222
fn main() {}

‎src/test/compile-fail/mir_check_cast_reify.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ fn bar<'a>(x: &'a u32) -> &'static u32 {
4545
// as part of checking the `ReifyFnPointer`.
4646
let f: fn(_) -> _ = foo;
4747
//~^ WARNING not reporting region error due to -Znll
48+
//~| ERROR free region `'_#1r` does not outlive free region `'static`
4849
f(x)
49-
//~^ ERROR free region `'_#1r` does not outlive free region `'static`
5050
}
5151

5252
fn main() {}

‎src/test/compile-fail/mir_check_cast_unsafe_fn.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ fn bar<'a>(input: &'a u32, f: fn(&'a u32) -> &'a u32) -> &'static u32 {
1717
// in `g`. These are related via the `UnsafeFnPointer` cast.
1818
let g: unsafe fn(_) -> _ = f;
1919
//~^ WARNING not reporting region error due to -Znll
20+
//~| ERROR free region `'_#1r` does not outlive free region `'static`
2021
unsafe { g(input) }
21-
//~^ ERROR free region `'_#1r` does not outlive free region `'static`
2222
}
2323

2424
fn main() {}

‎src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@ fn supply<'a, 'b, 'c>(cell_a: Cell<&'a u32>, cell_b: Cell<&'b u32>, cell_c: Cell
5454
// Only works if 'x: 'y:
5555
let p = x.get();
5656
//~^ WARN not reporting region error due to -Znll
57+
//~| ERROR free region `'_#5r` does not outlive free region `'_#6r`
5758
demand_y(x, y, p)
58-
//~^ ERROR free region `'_#5r` does not outlive free region `'_#6r`
5959
},
6060
);
6161
}

‎src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ warning: not reporting region error due to -Znll
55
| ^^^^^^^
66

77
error: free region `'_#5r` does not outlive free region `'_#6r`
8-
--> $DIR/propagate-approximated-fail-no-postdom.rs:57:25
8+
--> $DIR/propagate-approximated-fail-no-postdom.rs:55:17
99
|
10-
57 | demand_y(x, y, p)
11-
| ^
10+
55 | let p = x.get();
11+
| ^
1212

1313
note: No external requirements
1414
--> $DIR/propagate-approximated-fail-no-postdom.rs:53:9
@@ -17,8 +17,8 @@ note: No external requirements
1717
54 | | // Only works if 'x: 'y:
1818
55 | | let p = x.get();
1919
56 | | //~^ WARN not reporting region error due to -Znll
20-
57 | | demand_y(x, y, p)
21-
58 | | //~^ ERROR free region `'_#5r` does not outlive free region `'_#6r`
20+
57 | | //~| ERROR free region `'_#5r` does not outlive free region `'_#6r`
21+
58 | | demand_y(x, y, p)
2222
59 | | },
2323
| |_________^
2424
|

‎src/test/ui/nll/closure-requirements/propagate-approximated-ref.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ note: External requirements
2424
= note: where '_#1r: '_#2r
2525

2626
error: free region `'_#1r` does not outlive free region `'_#2r`
27-
--> $DIR/propagate-approximated-ref.rs:53:38
27+
--> $DIR/propagate-approximated-ref.rs:53:29
2828
|
2929
53 | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| {
30-
| ^^^^^^^
30+
| ^^^^^^^
3131

3232
note: No external requirements
3333
--> $DIR/propagate-approximated-ref.rs:52:1

‎src/test/ui/nll/closure-requirements/propagate-approximated-to-empty.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ warning: not reporting region error due to -Znll
55
| ^^^^^^^^^^^^^^^^^^^^^^^
66

77
error: free region `'_#6r` does not outlive free region `'_#4r`
8-
--> $DIR/propagate-approximated-to-empty.rs:41:21
8+
--> $DIR/propagate-approximated-to-empty.rs:41:18
99
|
1010
41 | demand_y(x, y, x.get())
11-
| ^
11+
| ^
1212

1313
note: No external requirements
1414
--> $DIR/propagate-approximated-to-empty.rs:39:47

‎src/test/ui/nll/closure-requirements/propagate-approximated-val.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,10 +24,10 @@ note: External requirements
2424
= note: where '_#1r: '_#2r
2525

2626
error: free region `'_#1r` does not outlive free region `'_#2r`
27-
--> $DIR/propagate-approximated-val.rs:46:37
27+
--> $DIR/propagate-approximated-val.rs:46:29
2828
|
2929
46 | establish_relationships(cell_a, cell_b, |outlives1, outlives2, x, y| {
30-
| ^^^^^^
30+
| ^^^^^^
3131

3232
note: No external requirements
3333
--> $DIR/propagate-approximated-val.rs:45:1

‎src/test/ui/nll/closure-requirements/propagate-from-trait-match.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@ where
4040
T: Trait<'a>,
4141
{
4242
establish_relationships(value, |value| {
43+
//~^ ERROR failed type test
44+
4345
// This function call requires that
4446
//
4547
// (a) T: Trait<'a>
@@ -52,7 +54,6 @@ where
5254

5355
require(value);
5456
//~^ WARNING not reporting region error due to -Znll
55-
//~| ERROR failed type test
5657
});
5758
}
5859

‎src/test/ui/nll/closure-requirements/propagate-from-trait-match.stderr

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
warning: not reporting region error due to -Znll
2-
--> $DIR/propagate-from-trait-match.rs:53:9
2+
--> $DIR/propagate-from-trait-match.rs:55:9
33
|
4-
53 | require(value);
4+
55 | require(value);
55
| ^^^^^^^
66

77
note: External requirements
88
--> $DIR/propagate-from-trait-match.rs:42:36
99
|
1010
42 | establish_relationships(value, |value| {
1111
| ____________________________________^
12-
43 | | // This function call requires that
13-
44 | | //
14-
45 | | // (a) T: Trait<'a>
12+
43 | | //~^ ERROR failed type test
13+
44 | |
14+
45 | | // This function call requires that
1515
... |
16-
55 | | //~| ERROR failed type test
17-
56 | | });
16+
56 | | //~^ WARNING not reporting region error due to -Znll
17+
57 | | });
1818
| |_____^
1919
|
2020
= note: defining type: DefId(0/1:16 ~ propagate_from_trait_match[317d]::supply[0]::{{closure}}[0]) with closure substs [
@@ -26,17 +26,17 @@ note: External requirements
2626
= note: number of external vids: 2
2727
= note: where T: '_#1r
2828

29-
error: failed type test: TypeTest { generic_kind: T/#1, lower_bound: '_#3r, point: bb0[3], span: $DIR/propagate-from-trait-match.rs:42:36: 56:6, test: IsOutlivedByAnyRegionIn(['_#2r]) }
29+
error: failed type test: TypeTest { generic_kind: T/#1, lower_bound: '_#3r, point: bb0[3], span: $DIR/propagate-from-trait-match.rs:42:36: 57:6, test: IsOutlivedByAnyRegionIn(['_#2r]) }
3030
--> $DIR/propagate-from-trait-match.rs:42:36
3131
|
3232
42 | establish_relationships(value, |value| {
3333
| ____________________________________^
34-
43 | | // This function call requires that
35-
44 | | //
36-
45 | | // (a) T: Trait<'a>
34+
43 | | //~^ ERROR failed type test
35+
44 | |
36+
45 | | // This function call requires that
3737
... |
38-
55 | | //~| ERROR failed type test
39-
56 | | });
38+
56 | | //~^ WARNING not reporting region error due to -Znll
39+
57 | | });
4040
| |_____^
4141

4242
note: No external requirements
@@ -47,8 +47,8 @@ note: No external requirements
4747
40 | | T: Trait<'a>,
4848
41 | | {
4949
... |
50-
56 | | });
51-
57 | | }
50+
57 | | });
51+
58 | | }
5252
| |_^
5353
|
5454
= note: defining type: DefId(0/0:6 ~ propagate_from_trait_match[317d]::supply[0]) with substs [

0 commit comments

Comments
 (0)