Use correct location for type tests in promoted constants #102187
Conversation
rustbot
added
the
T-compiler
|
r? @eholk (rust-highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
| @@ -622,6 +624,13 @@ impl<'a, 'b, 'tcx> TypeVerifier<'a, 'b, 'tcx> { | |||
| swap_constraints(self); | |||
|
|
|||
| let locations = location.to_locations(); | |||
|
|
|||
| // Use location of promoted const in collected constraints | |||
| for type_test in type_tests.iter() { | |||
There was a problem hiding this comment.
Is it possible to do this by iterating over self.cx.borrowck_context.constraints.type_tests directly and modifying in place? Or are the type tests shared with something else and the in place modification would break something else, or something like that?
There was a problem hiding this comment.
Or are the type tests shared with something else and the in place modification would break something else, or something like that?
Yes the type tests are shared with those of the body that contains the promoted constant, so we need some way to only collect the type tests of the promoted constant body when we type check that. swap_constraints is currently used for this. I'm not sure what the problem is with spawning an entirely new borrow checking context when type checking promoteds. Presumably this would cause slight performance problems when we only really care about the constraints being different? Not sure.
|
Yikes! I just realized I forgot to come back to this after you replied. Thanks for the explanation. This looks good to me. @bors r+ |
bors
added
S-waiting-on-bors
Rollup of 8 pull requests Successful merges: - rust-lang#102110 (Migrate rustc_passes diagnostics) - rust-lang#102187 (Use correct location for type tests in promoted constants) - rust-lang#102239 (Move style guide to rust-lang/rust) - rust-lang#102578 (Panic for invalid arguments of `{integer primitive}::ilog{,2,10}` in all modes) - rust-lang#102811 (Use memset to initialize readbuf) - rust-lang#102890 (Check representability in adt_sized_constraint) - rust-lang#102913 (unify `IsPattern` and `IsImport` enum in `show_candidates`) - rust-lang#102924 (rustdoc: remove unused classes from sidebar links) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
Previously we forgot to remap the location in a type test collected when visiting the body of a promoted constant back to the usage location, causing an ICE when trying to get span information for that type test.
Fixes #102117