Skip to content

Linker regression - #36960

Merged
bors merged 3 commits into
rust-lang:masterfrom
michaelwoerister:linker-regression
Oct 6, 2016
Merged

Linker regression#36960
bors merged 3 commits into
rust-lang:masterfrom
michaelwoerister:linker-regression

Conversation

@michaelwoerister

Copy link
Copy Markdown
Member

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

r? @eddyb

@eddyb

eddyb commented Oct 4, 2016

Copy link
Copy Markdown
Contributor

@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

bors commented Oct 4, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 4570199 has been approved by eddyb

@michaelwoerister

Copy link
Copy Markdown
MemberAuthor

@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
Copy Markdown
MemberAuthor

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

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

eddyb commented Oct 5, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 5, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 2d34ad0 has been approved by eddyb

sophiajt pushed a commit to sophiajt/rust that referenced this pull request Oct 6, 2016
… 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
@sophiajtsophiajt mentioned this pull request Oct 6, 2016
bors added a commit that referenced this pull request Oct 6, 2016
@bors
bors merged commit 2d34ad0 into rust-lang:masterOct 6, 2016
@nikomatsakis

Copy link
Copy Markdown
Contributor

Accepting for beta because small patch, regression.

cc @rust-lang/compiler

@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 11, 2016
@alexcrichtonalexcrichton mentioned this pull request Oct 11, 2016
@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 11, 2016
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

beta-acceptedAccepted for backporting to the compiler in the beta channel.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@michaelwoerister@eddyb@bors@nikomatsakis@brson