Miri: fix determining size of an "extra function" allocation#63076
Merged
bors merged 3 commits intorust-lang:masterfrom Jul 29, 2019
Merged
Miri: fix determining size of an "extra function" allocation#63076bors merged 3 commits intorust-lang:masterfrom
bors merged 3 commits intorust-lang:masterfrom
Conversation
… and avoid rightwards drift
rust-highfive
added
the
S-waiting-on-review
RalfJung
changed the title
This was referenced Jul 28, 2019
Merged
This comment has been minimized.
This comment has been minimized.
RalfJung
force-pushed
the
miri-fn-ptr-alloc-size
branch
from
73d11f5 to
c119291
Compare
Contributor
|
The function now locks the global map twice for gloabal non function pointer alloc IDs. Probably irrelevant perf wise though. |
Contributor
|
@bors r+ |
Collaborator
|
📌 Commit c119291 has been approved by |
bors
added
S-waiting-on-bors
Member
Author
Indeed. It will only do the fn ptr lookup though for allocations that are not in the local |
Contributor
|
I'm fine with it. We had that before my static cycle PR and I didn't see a perf improvement on that PR, so... |
Centril
reviewed
Jul 28, 2019
Member
Author
|
@bors r=oli-obk |
Collaborator
|
📌 Commit 0e602f1 has been approved by |
Centril
added a commit
to Centril/rust
that referenced
this pull request
Jul 29, 2019
…oli-obk Miri: fix determining size of an "extra function" allocation Fixes [a bug](rust-lang/miri#862) introduced by rust-lang#62982. Best reviewed commit-by-commit. r? @oli-obk
bors
added a commit
that referenced
this pull request
Jul 29, 2019
Rollup of 6 pull requests Successful merges: - #62809 (rustc: Update wasm32 support for LLVM 9) - #63055 (Various cleanups to save analysis) - #63076 (Miri: fix determining size of an "extra function" allocation) - #63077 (cleanup: Remove some language features related to built-in macros) - #63086 (Ignore test cases that are not supported by vxWorks) - #63092 (Update `impl Trait` gate issues) Failed merges: r? @ghost
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Fixes a bug introduced by #62982. Best reviewed commit-by-commit.
r? @oli-obk