Skip to content

More robust metadata lock - beta edition #34604

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

Merged
merged 3 commits into from
Jul 2, 2016

Conversation

arielb1
Copy link
Contributor

@arielb1 arielb1 commented Jul 1, 2016

Check the metadata lock when loading rather than afterwards

Fixes #33778
Fixes #33733
Fixes #33015

This is the beta cherry-pick of #34539, without some unnecessary refactoring.

@arielb1 arielb1 added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jul 1, 2016
@rust-highfive
Copy link
Contributor

r? @nrc

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

@rust-highfive
Copy link
Contributor

warning Warning warning

  • Pull requests are usually filed against the master branch for this repo, but this one is against beta. Please double check that you specified the right target!

@arielb1
Copy link
Contributor Author

arielb1 commented Jul 1, 2016

r? @brson

@rust-highfive rust-highfive assigned brson and unassigned nrc Jul 1, 2016
@arielb1 arielb1 force-pushed the metadata-hash-beta branch 2 times, most recently from 8fd4e34 to e324784 Compare July 1, 2016 21:52
@brson
Copy link
Contributor

brson commented Jul 1, 2016

Awesome fixes. Thanks @arielb1. I'm happy to backport. You @alexcrichton ?

@alexcrichton
Copy link
Member

I'm good backporting as well, @arielb1 can you ping once tests pass locally?

@arielb1 arielb1 force-pushed the metadata-hash-beta branch from e324784 to 50870c9 Compare July 1, 2016 22:54
arielb1 added 3 commits July 2, 2016 14:53
…sion

check the metadata lock when loading rather than afterwards

Fixes rust-lang#33733
Fixes rust-lang#33015
previously, only .so files included a metadata encoding version, *outside*
of the zlib compressed area. This adds an encoding version inside the metadata
itself, in both .so and .rlib files.

Fixes rust-lang#33778.
@arielb1 arielb1 force-pushed the metadata-hash-beta branch from 50870c9 to 8da25e8 Compare July 2, 2016 11:54
@arielb1
Copy link
Contributor Author

arielb1 commented Jul 2, 2016

Passes make check locally.

@alexcrichton alexcrichton merged commit e353933 into rust-lang:beta Jul 2, 2016
@alexcrichton alexcrichton added beta-accepted Accepted for backporting to the compiler in the beta channel. and removed beta-nominated Nominated for backporting to the compiler in the beta channel. labels Jul 2, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants