Skip to content

Make Allocation::bytes private #63561

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

Merged
merged 12 commits into from
Sep 3, 2019
Merged

Make Allocation::bytes private #63561

Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
9b9eecf
Store allocation size, make bytes, undef_mask private
197g Jul 13, 2019
2228b3f
Derive HashStable for Allocation
197g Aug 17, 2019
98cff69
Move copy of undef_mask into allocation
197g Jul 30, 2019
d8c5bc7
Replace usage of alloc.bytes in interpret
197g Jul 30, 2019
7b941e3
Expose encapsulated undef mask as immutable
197g Aug 14, 2019
df58fcf
Fix codegen with explicit allocation byte access
197g Aug 14, 2019
85d6b7b
Address naming and comments from reviews
197g Aug 28, 2019
6fe31fe
Make allocation relocation field private
197g Aug 29, 2019
bee2d37
Move relocation range copies into allocation
197g Aug 30, 2019
7388cb4
Fixup remaining direct relocation field references
197g Aug 30, 2019
823c3b9
Improve documentation around allocation accessors
197g Aug 31, 2019
f3c435e
Reorder AllocationDefinedness members
197g Aug 31, 2019
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
21 changes: 13 additions & 8 deletions src/librustc/mir/interpret/allocation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -581,8 +581,10 @@ impl<'tcx, Tag, Extra> Allocation<Tag, Extra> {
/// Run-length encoding of the undef mask.
/// Used to copy parts of a mask multiple times to another allocation.
pub struct AllocationDefinedness {
/// The lengths of ranges that are run-length encoded.
ranges: smallvec::SmallVec::<[u64; 1]>,
first: bool,
/// The definedness of the first range.
initial: bool,
}

/// Transferring the definedness mask to other allocations.
Expand All @@ -606,9 +608,9 @@ impl<Tag, Extra> Allocation<Tag, Extra> {
// where each element toggles the state

let mut ranges = smallvec::SmallVec::<[u64; 1]>::new();
let first = self.undef_mask.get(src.offset);
let initial = self.undef_mask.get(src.offset);
let mut cur_len = 1;
let mut cur = first;
let mut cur = initial;

for i in 1..size.bytes() {
// FIXME: optimize to bitshift the current undef block's bits and read the top bit
Expand All @@ -623,7 +625,7 @@ impl<Tag, Extra> Allocation<Tag, Extra> {

ranges.push(cur_len);

AllocationDefinedness { ranges, first, }
AllocationDefinedness { ranges, initial, }
}

/// Apply multiple instances of the run-length encoding to the undef_mask.
Expand All @@ -640,15 +642,15 @@ impl<Tag, Extra> Allocation<Tag, Extra> {
self.undef_mask.set_range_inbounds(
dest.offset,
dest.offset + size * repeat,
defined.first,
defined.initial,
);
return;
}

for mut j in 0..repeat {
j *= size.bytes();
j += dest.offset.bytes();
let mut cur = defined.first;
let mut cur = defined.initial;
for range in &defined.ranges {
let old_j = j;
j += range;
Expand Down Expand Up @@ -725,16 +727,19 @@ impl<Tag: Copy, Extra> Allocation<Tag, Extra> {
// shift offsets from source allocation to destination allocation
offset + dest_offset - src.offset,
reloc,
)
)
})
);
);
}

AllocationRelocations {
relative_relocations: new_relocations,
}
}

/// Apply a relocation copy.
/// The affected range, as defined in the parameters to `prepare_relocation_copy` is expected
/// to be clear of relocations.
pub fn mark_relocation_range(
&mut self,
relocations: AllocationRelocations<Tag>,
Expand Down