Skip to content

Fix Rc/Arc allocation layout - #55764

Merged
bors merged 1 commit into
rust-lang:masterfrom
murarth:fix-rc-alloc
Nov 11, 2018
Merged

Fix Rc/Arc allocation layout#55764
bors merged 1 commit into
rust-lang:masterfrom
murarth:fix-rc-alloc

Conversation

@murarth

@murarthmurarth commented Nov 7, 2018

Copy link
Copy Markdown
Contributor
  • Rounds allocation layout up to a multiple of alignment
  • Adds a convenience method Layout::pad_to_align to perform rounding

Closes#55747

cc #55724

@rust-highfive

rust-highfive commented Nov 7, 2018

Copy link
Copy Markdown
Contributor

r? @dtolnay

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Nov 7, 2018
@dtolnay

dtolnay commented Nov 7, 2018

Copy link
Copy Markdown
Member

r? @RalfJung

@rust-highfiverust-highfive assigned RalfJung and unassigned dtolnayNov 7, 2018
@murarth

murarth commented Nov 7, 2018

Copy link
Copy Markdown
ContributorAuthor

This PR adds a new method Layout::pad_to_align, using the same feature gate as existing unstable methods: #[unstable(feature = "allocator_api", issue = "32838")].

I'm not sure if this is acceptable or if futher discussion is required. That's why I've cc'd the relevant tracking issue for these methods.

RalfJung
RalfJung reviewed Nov 8, 2018
View reviewed changes
Comment threadsrc/liballoc/rc.rs Outdated

@RalfJungRalfJungNov 8, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I personally would find this more readable if you unwrapped early and avoided and_then:

let layout = Layout::new::<RcBox<()>>().extend(Layout::for_value(&*ptr)).unwrap().0.pad_to_align().unwrap();

@RalfJung

RalfJung commented Nov 8, 2018

Copy link
Copy Markdown
Member

The Rc/Arc part looks good to me.

Cc @Amanieu are you okay with the new unstable method on Layout? We can change this later; now it'd be good to get this bug fixed ASAP.

Amanieu
Amanieu reviewed Nov 8, 2018
View reviewed changes
Comment threadsrc/libcore/alloc.rs Outdated

@AmanieuAmanieuNov 8, 2018

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you change this to use the new feature name and tracking issue from #55366?

@murarth
Fix Rc/Arc allocation layout
317f494
* Rounds allocation layout up to a multiple of alignment
* Adds a convenience method `Layout::pad_to_align` to perform rounding
@murarth

murarth commented Nov 8, 2018

Copy link
Copy Markdown
ContributorAuthor

I've made the requested changes and the tests have passed.

@RalfJung

RalfJung commented Nov 9, 2018

Copy link
Copy Markdown
Member

@murarth great, thanks! In the future, please push a new commit instead of amending the old one. That way, I can see what you changed since my first review, instead of having to review it all again.

@bors r+

@bors

bors commented Nov 9, 2018

Copy link
Copy Markdown
Collaborator

📌 Commit 317f494 has been approved by RalfJung

@borsbors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Nov 9, 2018
@murarth

murarth commented Nov 9, 2018

Copy link
Copy Markdown
ContributorAuthor

@RalfJung Will do. Sorry about that. I thought amending was the expected convention.

@emilyalbiniemilyalbini mentioned this pull request Nov 10, 2018
Closed
emilyalbini added a commit to emilyalbini/rust that referenced this pull request Nov 10, 2018
@emilyalbini
Rollup merge ofrust-lang#55764- murarth:fix-rc-alloc, r=RalfJung
d2aeef0
Fix Rc/Arc allocation layout
* Rounds allocation layout up to a multiple of alignment
* Adds a convenience method `Layout::pad_to_align` to perform rounding
Closesrust-lang#55747
cc rust-lang#55724
@emilyalbiniemilyalbini mentioned this pull request Nov 10, 2018
Merged
bors added a commit that referenced this pull request Nov 11, 2018
@bors
Auto merge of#55859- pietroalbini:rollup, r=kennytm
b76ee83
Rollup of 17 pull requests
Successful merges:
- #55630 (resolve: Filter away macro prelude in modules with `#[no_implicit_prelude]` on 2018 edition)
- #55687 (Take supertraits into account when calculating associated types)
- #55745 (Convert `outlives_components`' return value to a `SmallVec` outparam.)
- #55764 (Fix Rc/Arc allocation layout)
- #55792 (Prevent ICE in const-prop array oob check)
- #55799 (Removed unneeded instance of `// revisions` from a lint test)
- #55800 (Fix ICE in `return_type_impl_trait`)
- #55801 (NLL: Update box insensitivity test)
- #55802 (Don't inline virtual calls (take 2))
- #55816 (Use `SmallVec` to avoid allocations in `from_decimal_string`.)
- #55819 (Typecheck patterns of all match arms first, so we get types for bindings)
- #55822 (ICE with #![feature(nll)] and elided lifetimes)
- #55828 (Add missing `rustc_promotable` attribute to unsigned `min_value` and `max_value`)
- #55839 (Fix docstring spelling mistakes)
- #55844 (Fix documentation typos.)
- #55845 (Set BINARYEN_TRAP_MODE=clamp)
- #55856 (rustdoc: refactor: move all static-file include!s into a single module)
@bors
bors merged commit 317f494 into rust-lang:masterNov 11, 2018
@RalfJungRalfJung mentioned this pull request Nov 11, 2018
Merged
SimonSapin
SimonSapin reviewed Nov 11, 2018
View reviewed changes
Comment threadsrc/libcore/alloc.rs
let new_size = self.size().checked_add(pad)
.ok_or(LayoutErr { private: () })?;

Layout::from_size_align(new_size, self.align())

@SimonSapinSimonSapinNov 11, 2018

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could be from_size_align_unchecked, right?

@murarth
murarth deleted the fix-rc-alloc branch November 11, 2018 16:10
@RalfJung

RalfJung commented Nov 12, 2018

Copy link
Copy Markdown
Member

With this, miri's Rc tests now pass with full validation enabled. :)

Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AmanieuAmanieuAmanieu left review comments
@SimonSapinSimonSapinSimonSapin left review comments
@RalfJungRalfJungRalfJung left review comments

Assignees

@RalfJungRalfJung

Labels

S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

7 participants

@murarth@rust-highfive@dtolnay@RalfJung@bors@Amanieu@SimonSapin