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

debuginfo: Handle spread_arg case in MIR-trans in a more stable way. #37153

Merged
merged 1 commit into from
Oct 17, 2016
Merged

debuginfo: Handle spread_arg case in MIR-trans in a more stable way. #37153

merged 1 commit into from
Oct 17, 2016

Conversation

michaelwoerister
Copy link
Member

Use VariableAccess::DirectVariable instead of VariableAccess::IndirectVariable in order not to make LLVM's SROA angry. This is a step towards fixing #36774 and #35547. At least, I can build Cargo with optimizations + debuginfo again.

r? @eddyb

@eddyb
Copy link
Member

eddyb commented Oct 13, 2016

@bors r+

@bors
Copy link
Contributor

bors commented Oct 13, 2016

📌 Commit 8d5b523 has been approved by eddyb

@michaelwoerister michaelwoerister mentioned this pull request Oct 14, 2016
Closed
@cuviper
Copy link
Member

cuviper commented Oct 14, 2016

Yay - this fix also appears to work when applied to 1.12.0! The backport just needs to change the arg_decl.name.unwrap_or(...) to arg_decl.debug_name. Can we nominate this for beta+stable?

@cuviper cuviper mentioned this pull request Oct 14, 2016
Merged
@michaelwoerister
Copy link
Member Author

The change should certainly be unproblematic.

@michaelwoerister michaelwoerister added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 14, 2016
@bors
Copy link
Contributor

bors commented Oct 16, 2016

⌛ Testing commit 8d5b523 with merge dcb6fbe...

@bors
Copy link
Contributor

bors commented Oct 16, 2016

💔 Test failed - auto-win-gnu-32-opt-rustbuild

@thepowersgang
Copy link
Contributor

Failure was transient (git crashed during clone), retry?

@michaelwoerister
Copy link
Member Author

@bors retry

@bors
Copy link
Contributor

bors commented Oct 16, 2016

⌛ Testing commit 8d5b523 with merge c3216d7...

bors added a commit that referenced this pull request Oct 16, 2016
@bors
Auto merge of #37153 - michaelwoerister:spread-arg-debuginfo, r=eddyb
c3216d7 
debuginfo: Handle spread_arg case in MIR-trans in a more stable way.

Use `VariableAccess::DirectVariable` instead of `VariableAccess::IndirectVariable` in order not to make LLVM's SROA angry. This is a step towards fixing #36774 and #35547. At least, I can build Cargo with optimizations + debuginfo again.

r? @eddyb
@bors
Copy link
Contributor

bors commented Oct 16, 2016

💔 Test failed - auto-mac-64-opt-rustbuild

@alexcrichton
Copy link
Member

@bors: retry

On Sun, Oct 16, 2016 at 7:21 AM, bors notifications@github.com wrote:

💔 Test failed - auto-mac-64-opt-rustbuild
https://buildbot.rust-lang.org/builders/auto-mac-64-opt-rustbuild/builds/2735

—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
#37153 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95OT99xgRaM_fIOv7zrcL44J4CoCrks5q0jL2gaJpZM4KWZrV
.

@bors
Copy link
Contributor

bors commented Oct 16, 2016

⚡ Previous build results for auto-linux-32-nopt-t, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-opt, auto-linux-64-x-android-t, auto-linux-musl-64-opt, auto-mac-32-opt, auto-win-msvc-32-opt are reusable. Rebuilding only auto-linux-32-opt, auto-linux-64-nopt-t, auto-linux-64-opt-rustbuild, auto-linux-cross-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild...

@bors
Copy link
Contributor

bors commented Oct 16, 2016

💔 Test failed - auto-win-gnu-32-opt

@alexcrichton
Copy link
Member

@bors: retry

On Sun, Oct 16, 2016 at 4:49 PM, bors notifications@github.com wrote:

💔 Test failed - auto-win-gnu-32-opt
https://buildbot.rust-lang.org/builders/auto-win-gnu-32-opt/builds/5918

—
You are receiving this because you commented.
Reply to this email directly, view it on GitHub
#37153 (comment), or mute
the thread
https://github.com/notifications/unsubscribe-auth/AAD95HnRuLc_icvh941YtaZAWvLz5Z7wks5q0rgFgaJpZM4KWZrV
.

@bors
Copy link
Contributor

bors commented Oct 17, 2016

⌛ Testing commit 8d5b523 with merge da7f8c5...

bors added a commit that referenced this pull request Oct 17, 2016
@bors
Auto merge of #37153 - michaelwoerister:spread-arg-debuginfo, r=eddyb
da7f8c5 
debuginfo: Handle spread_arg case in MIR-trans in a more stable way.

Use `VariableAccess::DirectVariable` instead of `VariableAccess::IndirectVariable` in order not to make LLVM's SROA angry. This is a step towards fixing #36774 and #35547. At least, I can build Cargo with optimizations + debuginfo again.

r? @eddyb
@bors
Copy link
Contributor

bors commented Oct 17, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, auto-linux-64-cargotest, auto-linux-64-cross-freebsd, auto-linux-64-debug-opt, auto-linux-64-nopt-t, auto-linux-64-opt, auto-linux-64-opt-rustbuild, auto-linux-64-x-android-t, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-opt, auto-mac-64-opt-rustbuild, auto-mac-cross-ios-opt, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-cargotest, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild
Approved by: eddyb
Pushing da7f8c5 to master...

@bors bors merged commit 8d5b523 into rust-lang:master Oct 17, 2016
@brson brson mentioned this pull request Oct 18, 2016
Merged
@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 18, 2016
@nikomatsakis
Copy link
Contributor

Accepting for beta. Small patch, regression.

cc @rust-lang/compiler

@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 18, 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.
8 participants
@michaelwoerister @eddyb @bors @cuviper @thepowersgang @alexcrichton @nikomatsakis @brson