Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable -Zdrop-tracking-mir by default #107421

Merged
merged 11 commits into from
Sep 23, 2023
Merged

Enable -Zdrop-tracking-mir by default #107421

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift click to select a range
9450b75
Do not construct def_path_str for MustNotSuspend.
cjgillot May 16, 2023
ff03204
Fold lifetimes before substitution.
cjgillot Jun 3, 2023
a626caa
Revert duplication of tests.
cjgillot May 7, 2023
286502c
Enable drop_tracking_mir by default.
cjgillot Jan 28, 2023
211d2ed
Bless tests.
cjgillot Jun 24, 2023
d989e14
Bless mir-opt
cjgillot Jan 28, 2023
6aa1268
Bless clippy.
cjgillot Jan 28, 2023
baa64b0
Remove dead error code.
cjgillot Jun 7, 2023
855a75b
Remove useless wrapper.
cjgillot Aug 3, 2023
44ac8dc
Remove GeneratorWitness and rename GeneratorWitnessMIR.
cjgillot Aug 3, 2023
bffb346
Make test more robust to opts.
cjgillot Sep 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fold lifetimes before substitution.
  • Loading branch information
@cjgillot
cjgillot committed Sep 23, 2023
commit ff032043653e7aebfbf74ab59572f929aa2beb65
28 changes: 14 additions & 14 deletions compiler/rustc_trait_selection/src/traits/select/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3115,25 3115,25 @@ fn bind_generator_hidden_types_above<'tcx>(
.generator_hidden_types(def_id)
// Deduplicate tys to avoid repeated work.
.filter(|bty| seen_tys.insert(*bty))
.map(|bty| {
let mut ty = bty.instantiate(tcx, args);

.map(|mut bty| {
// Only remap erased regions if we use them.
if considering_regions {
ty = tcx.fold_regions(ty, |r, current_depth| match r.kind() {
ty::ReErased => {
let br = ty::BoundRegion {
var: ty::BoundVar::from_u32(counter),
kind: ty::BrAnon(None),
};
counter = 1;
ty::Region::new_late_bound(tcx, current_depth, br)
}
r => bug!("unexpected region: {r:?}"),
bty = bty.map_bound(|ty| {
tcx.fold_regions(ty, |r, current_depth| match r.kind() {
ty::ReErased => {
let br = ty::BoundRegion {
var: ty::BoundVar::from_u32(counter),
kind: ty::BrAnon(None),
};
counter = 1;
ty::Region::new_late_bound(tcx, current_depth, br)
}
r => bug!("unexpected region: {r:?}"),
})
})
}

ty
bty.instantiate(tcx, args)
})
.collect();
if considering_regions {
Expand Down