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.

Sign up for GitHub

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

Jump to bottom

Linker regression #36960

Merged
merged 3 commits into from
Oct 6, 2016
Merged

Linker regression #36960

merged 3 commits into from
Oct 6, 2016

Conversation

michaelwoerister
Copy link
Member

This should fix the symbol conflicts reported in #36852.
The PR also makes some debug output a bit more informative.

r? @eddyb

@eddyb
Copy link
Member

eddyb commented Oct 4, 2016

@bors r+

Also, does this affect beta, i.e. do we need to backport this?
I recall @camlorn trying -Zincremental at stage0 and it not working, although I don't know if it's this bug.

@bors
Copy link
Contributor

bors commented Oct 4, 2016

📌 Commit 4570199 has been approved by eddyb

@michaelwoerister
Copy link
Member Author

@bors r-

The new code fails when the same shim is instantiated twice (can't define the same function two times). Will fix.

@michaelwoerister
Copy link
Member Author

OK, the updated version passes make check.
Yes, I think backporting the fix for fn once shims would make sense (it's very small and uncontroversial, I think).

@michaelwoerister michaelwoerister added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 5, 2016
@eddyb
Copy link
Member

eddyb commented Oct 5, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Oct 5, 2016

📌 Commit 2d34ad0 has been approved by eddyb

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Oct 6, 2016
Rollup merge of rust-lang#36960 - michaelwoerister:linker-regression,…
1a7aa75 
… r=eddyb

Linker regression

This should fix the symbol conflicts reported in rust-lang#36852.
The PR also makes some debug output a bit more informative.

r? @eddyb
@sophiajt sophiajt mentioned this pull request Oct 6, 2016
Merged
bors added a commit that referenced this pull request Oct 6, 2016
@bors
Auto merge of #37002 - jonathandturner:rollup, r=jonathandturner
ad19c32 
Rollup of 15 pull requests

- Successful merges: #36726, #36832, #36909, #36930, #36932, #36957, #36959, #36960, #36962, #36965, #36966, #36967, #36972, #36974, #36977
- Failed merges:
@bors bors merged commit 2d34ad0 into rust-lang:master Oct 6, 2016
@nikomatsakis
Copy link
Contributor

Accepting for beta because small patch, regression.

cc @rust-lang/compiler

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 11, 2016
@alexcrichton alexcrichton mentioned this pull request Oct 11, 2016
Merged
@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 11, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@eddyb eddyb

Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@michaelwoerister @eddyb @bors @nikomatsakis @brson