Skip to content
Permalink
Browse files

Fix #57979 by allowing a legitimate type error to take precedence ove…

…r an ICE.
  • Loading branch information...
pnkfelix committed Feb 22, 2019
1 parent f47ec2a commit 4f89846377a51b382ec418aa5661640c015561e0
Showing with 10 additions and 1 deletion.
  1. +10 −1 src/librustc/infer/canonical/canonicalizer.rs
@@ -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
}
}
}

0 comments on commit 4f89846

Please sign in to comment.
You can’t perform that action at this time.