Skip to content

Fix coroutine layout bug from PR #150116 #150275

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

Closed
leonardocxavier wants to merge 1 commit into from
+5 −4
Closed

Fix coroutine layout bug from PR #150116 #150275

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
9 changes: 5 additions & 4 deletions compiler/rustc_abi/src/layout/coroutine.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ pub(super) fn layout<
// obtain a valid (bijective) mapping.
let memory_index = in_memory_order.invert_bijective_mapping();
let invalid_field_idx = promoted_memory_index.len() + memory_index.len();
let mut combined_in_memory_order =
let mut combined_inverse_memory_index =
IndexVec::from_elem_n(FieldIdx::new(invalid_field_idx), invalid_field_idx);

let mut offsets_and_memory_index = iter::zip(offsets, memory_index);
Expand All @@ -265,14 +265,15 @@ pub(super) fn layout<
(promoted_offsets[field_idx], promoted_memory_index[field_idx])
}
};
combined_in_memory_order[memory_index] = i;
combined_inverse_memory_index[memory_index] = i;
offset
})
.collect();

// Remove the unused slots to obtain the combined `in_memory_order`
// Remove the unused slots and invert to obtain the combined `in_memory_order`
// (also see previous comment).
combined_in_memory_order.raw.retain(|&i| i.index() != invalid_field_idx);
combined_inverse_memory_index.raw.retain(|&i| i.index() != invalid_field_idx);
let combined_in_memory_order = combined_inverse_memory_index;

variant.fields = FieldsShape::Arbitrary {
offsets: combined_offsets,
Expand Down
Loading