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

rebase rust llvm patches on top of llvm HEAD #3628

Closed
wants to merge 5 commits into from

Conversation

erickt
Copy link
Contributor

@erickt erickt commented Sep 29, 2012

This fixes #3142, and depends on brson/llvm#3 being accepted. Along the way I found a particularly interesting bug. Two closures in a method shared the same mangled name, which caused a rather confusing collision. I solved this by changing trans_expr_fn to use mangle_internal_name_by_path_and_seq, but to be perfectly honest, I have no idea why we never hit this before.

@brson
Copy link
Contributor

brson commented Sep 29, 2012

The first time the mac bots built this they hit an error in compiler-rt: http://bot.rust-lang.org/logs/2012/08/29/2012-09-29T21:41:42Z-4dfd5aad-c1c2-42c6-a87a-d4dd89013281.html

Second time built fine

@brson
Copy link
Contributor

brson commented Sep 30, 2012

@brson
Copy link
Contributor

brson commented Sep 30, 2012

Oh, i deleted the workspace on the wrong bot while I was testing. windows is probably fine.

erickt and others added 4 commits September 29, 2012 19:25
two closures in the same function body can end up having
the same mangled name. This small patch uses gensym to
uniquely name each closure body so there won't be conflicts.
@brson
Copy link
Contributor

brson commented Sep 30, 2012

I'm feeling confident about the branch that's on try now. I want to see the window bot go green though.

@erickt
Copy link
Contributor Author

erickt commented Sep 30, 2012

I just realized I forgot to update compiler-rt. Didn't seem to be an issue on my mac, but maybe it was causing problems for windows. I just updated this request to include it. It depends on brson/llvm#4 before it can land though.

@brson
Copy link
Contributor

brson commented Sep 30, 2012

Pushed to both try and try2. try is showing a mysterious test failure on windows (on yesterday's push)

@brson
Copy link
Contributor

brson commented Sep 30, 2012

I suspect that failure on windows is preexisting since the 'try' branch runs the 'check-lite' target that the windows bots don't usually run.

@brson
Copy link
Contributor

brson commented Oct 1, 2012

Merged1

@brson brson closed this Oct 1, 2012
bors pushed a commit to rust-lang-ci/rust that referenced this pull request May 15, 2021
RalfJung pushed a commit to RalfJung/rust that referenced this pull request May 26, 2024
add back some tokio features

Turns out I went a bit too fer when I removed features, so `socketpair` was no longer used.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants