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

Fix ICE on i686 when calling immediate() on OperandValue::Ref in return #38855

Merged
merged 1 commit into from
Jan 7, 2017

Conversation

Mark-Simulacrum
Copy link
Member

Fixes #38727, and adds a test case.

r? @eddyb

@@ -223,7 +223,12 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
load
} else {
let op = self.trans_consume(&bcx, &mir::Lvalue::Local(mir::RETURN_POINTER));
op.pack_if_pair(&bcx).immediate()
let op_ref = op.pack_if_pair(&bcx);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd move this into the else.

@eddyb eddyb added beta-nominated Nominated for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Jan 5, 2017
@eddyb
Copy link
Member

eddyb commented Jan 5, 2017

@bors r+

@bors
Copy link
Contributor

bors commented Jan 5, 2017

📌 Commit 97c008c has been approved by eddyb

@nikomatsakis nikomatsakis added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Jan 5, 2017
@nikomatsakis
Copy link
Contributor

Approved for beta. Small patch, regression.

cc @rust-lang/compiler

@alexcrichton
Copy link
Member

@bors: p=1

This is a backport

@bors
Copy link
Contributor

bors commented Jan 6, 2017

⌛ Testing commit 97c008c with merge a754a23...

@bors
Copy link
Contributor

bors commented Jan 6, 2017

💔 Test failed - status-travis

@eddyb
Copy link
Member

eddyb commented Jan 6, 2017

@bors retry

  • cloning LLVM failed

@nikomatsakis nikomatsakis mentioned this pull request Jan 6, 2017
17 tasks
@bors
Copy link
Contributor

bors commented Jan 6, 2017

⌛ Testing commit 97c008c with merge 7ecb5b7...

@bors
Copy link
Contributor

bors commented Jan 6, 2017

💔 Test failed - status-travis

@alexcrichton
Copy link
Member

alexcrichton commented Jan 6, 2017 via email

nikomatsakis added a commit to nikomatsakis/rust that referenced this pull request Jan 6, 2017
@nikomatsakis nikomatsakis mentioned this pull request Jan 6, 2017
6 tasks
@bors
Copy link
Contributor

bors commented Jan 7, 2017

⌛ Testing commit 97c008c with merge 25bfc8a...

bors added a commit that referenced this pull request Jan 7, 2017
Fix ICE on i686 when calling immediate() on OperandValue::Ref in return

Fixes #38727, and adds a test case.

r? @eddyb
@bors
Copy link
Contributor

bors commented Jan 7, 2017

☀️ Test successful - status-appveyor, status-travis
Approved by: eddyb
Pushing 25bfc8a to master...

@bors bors merged commit 97c008c into rust-lang:master Jan 7, 2017
@alexcrichton alexcrichton removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Jan 7, 2017
@Mark-Simulacrum Mark-Simulacrum deleted the immediate-fix branch January 14, 2017 04:59
@Mark-Simulacrum Mark-Simulacrum restored the immediate-fix branch January 14, 2017 04:59
@Mark-Simulacrum Mark-Simulacrum deleted the immediate-fix branch March 25, 2017 17:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants