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

Fix tupling of fn args for rust-call ABI functions #32393

Merged
merged 1 commit into from
Mar 21, 2016
Merged

Fix tupling of fn args for rust-call ABI functions #32393

merged 1 commit into from
Mar 21, 2016

Conversation

dotdash
Copy link
Contributor

@dotdash dotdash commented Mar 21, 2016

Fixes #32389

@rust-highfive
Copy link
Contributor

r? @Aatch

(rust_highfive has picked a reviewer for you, use r? to override)

@dotdash
Copy link
Contributor Author

dotdash commented Mar 21, 2016

r? @eddyb

@rust-highfive rust-highfive assigned eddyb and unassigned Aatch Mar 21, 2016
@dotdash
Copy link
Contributor Author

dotdash commented Mar 21, 2016

Err, so having a runpass test with an endless loop isn't that smart it seems... facepalm

eddyb
eddyb reviewed Mar 21, 2016
View reviewed changes
src/librustc_trans/trans/base.rs
@@ -1685,6 +1685,7 @@ impl<'blk, 'tcx> FunctionContext<'blk, 'tcx> {
for (j, &tupled_arg_ty) in tupled_arg_tys.iter().enumerate() {
let dst = StructGEP(bcx, llval, j);
let arg = &self.fn_ty.args[idx];
idx += 1;
Copy link
Member

Choose a reason for hiding this comment

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

Huh, did I forget this in both places? I know @nikomatsakis noticed this was missing on the MIR side.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Copy-Pasta? 🍝 ;-)

@dotdash
Copy link
Contributor Author

dotdash commented Mar 21, 2016

Test fixed

@eddyb
Copy link
Member

eddyb commented Mar 21, 2016

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 21, 2016

📌 Commit 4fd318b has been approved by eddyb

@alexcrichton
Copy link
Member

@bors: p=1

Thanks for the quick fix @dotdash! Gonna bump this a bit as it's fixing a regression

@bors
Copy link
Collaborator

bors commented Mar 21, 2016

⌛ Testing commit 4fd318b with merge 499ae5a...

bors added a commit that referenced this pull request Mar 21, 2016
@bors
Auto merge of #32393 - dotdash:32389, r=eddyb
499ae5a 
Fix tupling of fn args for rust-call ABI functions

Fixes #32389
@alexcrichton
Copy link
Member

@bors: retry force clean

@bors
Copy link
Collaborator

bors commented Mar 21, 2016

⌛ Testing commit 4fd318b with merge 0168dc7...

bors added a commit that referenced this pull request Mar 21, 2016
@bors
Auto merge of #32393 - dotdash:32389, r=eddyb
0168dc7 
Fix tupling of fn args for rust-call ABI functions

Fixes #32389
@bors
Copy link
Collaborator

bors commented Mar 21, 2016

☀️ Test successful - auto-linux-32-nopt-t, auto-linux-32-opt, 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-64-x-armhf, auto-linux-64-x-armsf, auto-linux-64-x-freebsd, auto-linux-64-x-netbsd, auto-linux-cross-opt, auto-linux-musl-64-opt, auto-mac-32-opt, auto-mac-64-nopt-t, auto-mac-64-opt, auto-mac-ios-opt, auto-win-gnu-32-nopt-t, auto-win-gnu-32-opt, auto-win-gnu-32-opt-rustbuild, auto-win-gnu-64-nopt-t, auto-win-gnu-64-opt, auto-win-msvc-32-opt, auto-win-msvc-64-opt, auto-win-msvc-64-opt-rustbuild

@bors bors merged commit 4fd318b into rust-lang:master Mar 21, 2016
@dotdash dotdash deleted the 32389 branch May 17, 2016 03:43
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
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@dotdash @rust-highfive @eddyb @bors @alexcrichton @Aatch