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: fix determining size of an "extra function" allocation #63076

Merged
merged 3 commits into from
Jul 29, 2019

Conversation

RalfJung
Copy link
Member

Fixes a bug introduced by #62982. Best reviewed commit-by-commit.

r? @oli-obk

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 28, 2019
@RalfJung RalfJung changed the title Miri fn ptr alloc size Miri: fix determining size of an "extra function" allocation Jul 28, 2019
@rust-highfive

This comment has been minimized.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 28, 2019

The function now locks the global map twice for gloabal non function pointer alloc IDs. Probably irrelevant perf wise though.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 28, 2019

@bors r+

@bors
Copy link
Contributor

bors commented Jul 28, 2019

📌 Commit c119291 has been approved by oli-obk

@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 28, 2019
@RalfJung
Copy link
Member Author

The function now locks the global map twice for gloabal non function pointer alloc IDs. Probably irrelevant perf wise though.

Indeed. It will only do the fn ptr lookup though for allocations that are not in the local alloc_map, so only for a small fraction. I'd offer to perf both versions but you seem to be fine with this since you already r+'d?

@oli-obk
Copy link
Contributor

oli-obk commented Jul 28, 2019

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...

@RalfJung
Copy link
Member Author

@bors r=oli-obk

@bors
Copy link
Contributor

bors commented Jul 28, 2019

📌 Commit 0e602f1 has been approved by oli-obk

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
@bors bors merged commit 0e602f1 into rust-lang:master Jul 29, 2019
@RalfJung RalfJung deleted the miri-fn-ptr-alloc-size branch July 29, 2019 08:01
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.

5 participants