Skip to content

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

Merged
bors merged 1 commit into
rust-lang:masterfrom
michaelwoerister:spread-arg-debuginfo
Oct 17, 2016
Merged

debuginfo: Handle spread_arg case in MIR-trans in a more stable way.#37153
bors merged 1 commit into
rust-lang:masterfrom
michaelwoerister:spread-arg-debuginfo

Conversation

@michaelwoerister

@michaelwoeristermichaelwoerister commented Oct 13, 2016

Copy link
Copy Markdown
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

eddyb commented Oct 13, 2016

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Oct 13, 2016

Copy link
Copy Markdown
Collaborator

📌 Commit 8d5b523 has been approved by eddyb

@michaelwoeristermichaelwoerister mentioned this pull request Oct 14, 2016
Closed
@cuviper

cuviper commented Oct 14, 2016

Copy link
Copy Markdown
Member

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?

@cuvipercuviper mentioned this pull request Oct 14, 2016
Merged
@michaelwoerister

michaelwoerister commented Oct 14, 2016

Copy link
Copy Markdown
MemberAuthor

The change should certainly be unproblematic.

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

bors commented Oct 16, 2016

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 8d5b523 with merge dcb6fbe...

@bors

bors commented Oct 16, 2016

Copy link
Copy Markdown
Collaborator

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

@thepowersgang

thepowersgang commented Oct 16, 2016

Copy link
Copy Markdown
Contributor

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

@michaelwoerister

michaelwoerister commented Oct 16, 2016

Copy link
Copy Markdown
MemberAuthor

@bors retry

@bors

bors commented Oct 16, 2016

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Oct 16, 2016

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

alexcrichton commented Oct 16, 2016

Copy link
Copy Markdown
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

bors commented Oct 16, 2016

Copy link
Copy Markdown
Collaborator

⚡ 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

bors commented Oct 16, 2016

Copy link
Copy Markdown
Collaborator

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

@alexcrichton

alexcrichton commented Oct 17, 2016

Copy link
Copy Markdown
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

bors commented Oct 17, 2016

Copy link
Copy Markdown
Collaborator

⌛ 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

bors commented Oct 17, 2016

Copy link
Copy Markdown
Collaborator

☀️ 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:masterOct 17, 2016
@brsonbrson mentioned this pull request Oct 18, 2016
Merged
@nikomatsakisnikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Oct 18, 2016
@nikomatsakis

nikomatsakis commented Oct 18, 2016

Copy link
Copy Markdown
Contributor

Accepting for beta. Small patch, regression.

cc @rust-lang/compiler

@brsonbrson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Oct 18, 2016
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@eddybeddyb

Labels

beta-acceptedAccepted 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