squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #58649 - pnkfelix:issue-57464-avoid-ice-when-region-sneaks-into-impl-trait, r=pnkfelix

Browse source 
avoid ICE when region sneaks into impl trait

Addresses non-NLL instances of #57464
This commit is contained in:
bors 2019-02-25 14:48:29 +00:00
commit b57fe74a27
1 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/librustc/infer/canonical/canonicalizer.rs
View file

@ -191,7 +191,16 @@ impl CanonicalizeRegionMode for CanonicalizeQueryResponse {
// response should be executing in a fully
// canonicalized environment, so there shouldn't be
// any other region names it can come up.
bug!("unexpected region in query response: `{:?}`", r)
//
// rust-lang/rust#57464: `impl Trait` can leak local
// scopes (in manner violating typeck). Therefore, use
// `delay_span_bug` to allow type error over an ICE.
ty::tls::with_context(|c| {
c.tcx.sess.delay_span_bug(
syntax_pos::DUMMY_SP,
&format!("unexpected region in query response: `{:?}`", r));
});
r
}
}
}