Skip to content

Commit

Permalink
Auto merge of #58649 - pnkfelix:issue-57464-avoid-ice-when-region-sne…
Browse files Browse the repository at this point in the history
…aks-into-impl-trait, r=pnkfelix

avoid ICE when region sneaks into impl trait

Addresses non-NLL instances of #57464
  • Loading branch information
bors committed Feb 25, 2019
2 parents da57320 + 4f89846 commit b57fe74
Showing 1 changed file with 10 additions and 1 deletion.
11 changes: 10 additions & 1 deletion src/librustc/infer/canonical/canonicalizer.rs
Expand Up @@ -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
}
}
}
Expand Down

0 comments on commit b57fe74

Please sign in to comment.