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.

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

miri realloc: do not require giving old size+align #62295

Merged
merged 1 commit into from
Jul 4, 2019

Conversation

RalfJung
Copy link
Member

@RalfJung RalfJung commented Jul 2, 2019

No description provided.

@rust-highfive
Copy link
Collaborator

r? @cramertj

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

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 2, 2019
@cramertj
Copy link
Member

cramertj commented Jul 2, 2019

r? @oli-obk

@rust-highfive rust-highfive assigned oli-obk and unassigned cramertj Jul 2, 2019
@RalfJung
Copy link
Member Author

RalfJung commented Jul 2, 2019

Oli is on vacation for two weeks. @cramertj do you think someone else could do the review?

@cramertj
Copy link
Member

cramertj commented Jul 2, 2019

Ah, sure! I feel fine about the code here, but I have no idea what the context is for this change. If you're comfortable that this is in fact a change you actually want to make here, then r=me I suppose, unless there's someone else who knows this code / what's going on here well.

@RalfJung
Copy link
Member Author

RalfJung commented Jul 2, 2019

It's a rather small change for a Miri-only API that I do feel confident in. This is needed to enable rust-lang/miri#817 to land.

Thanks!

@bors r=cramertj

@bors
Copy link
Contributor

bors commented Jul 2, 2019

📌 Commit b49fb76 has been approved by cramertj

@bors bors 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 Jul 2, 2019
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
miri realloc: do not require giving old size+align
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
miri realloc: do not require giving old size+align
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
miri realloc: do not require giving old size+align
bors added a commit that referenced this pull request Jul 3, 2019
Rollup of 17 pull requests

Successful merges:

 - #62039 (Remove needless lifetimes (rustc))
 - #62153 (Update the `rust-installer` submodule)
 - #62173 (rename InterpretCx -> InterpCx)
 - #62240 (wfcheck: resolve the type-vars in `AdtField` types)
 - #62249 (Use mem::take instead of mem::replace with default)
 - #62252 (Update mem::replace example to not be identical to mem::take)
 - #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser)
 - #62268 (Clean up inherent_impls)
 - #62287 (Use link attributes on extern "C" blocks with llvm-libuwind)
 - #62295 (miri realloc: do not require giving old size+align)
 - #62297 (refactor check_for_substitution)
 - #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.)
 - #62317 (Migrate `compile-pass` annotations to `build-pass`)
 - #62337 (Fix bucket in CPU usage script)
 - #62344 (simplify Option::get_or_insert)
 - #62346 (enable a few more tests in Miri and update the comment for others)
 - #62351 (remove bogus example from drop_in_place)

Failed merges:

r? @ghost
Centril added a commit to Centril/rust that referenced this pull request Jul 3, 2019
miri realloc: do not require giving old size+align
bors added a commit that referenced this pull request Jul 3, 2019
Rollup of 16 pull requests

Successful merges:

 - #62039 (Remove needless lifetimes (rustc))
 - #62173 (rename InterpretCx -> InterpCx)
 - #62240 (wfcheck: resolve the type-vars in `AdtField` types)
 - #62249 (Use mem::take instead of mem::replace with default)
 - #62252 (Update mem::replace example to not be identical to mem::take)
 - #62258 (syntax: Unsupport `foo! bar { ... }` macros in the parser)
 - #62268 (Clean up inherent_impls)
 - #62287 (Use link attributes on extern "C" blocks with llvm-libuwind)
 - #62295 (miri realloc: do not require giving old size+align)
 - #62297 (refactor check_for_substitution)
 - #62316 (When possible without changing semantics, implement Iterator::last in terms of DoubleEndedIterator::next_back for types in liballoc and libcore.)
 - #62317 (Migrate `compile-pass` annotations to `build-pass`)
 - #62337 (Fix bucket in CPU usage script)
 - #62344 (simplify Option::get_or_insert)
 - #62346 (enable a few more tests in Miri and update the comment for others)
 - #62351 (remove bogus example from drop_in_place)

Failed merges:

r? @ghost
@bors bors merged commit b49fb76 into rust-lang:master Jul 4, 2019
bors added a commit to rust-lang/miri that referenced this pull request Jul 5, 2019
align small malloc-allocations even less, and test that we do

Needs rust-lang/rust#62295 to land.

Fixes #812.
@RalfJung RalfJung deleted the miri-realloc branch July 6, 2019 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants