Skip to content

RustIntrinsic and PlatformIntrinsic are also the same ABI as Rust #62674

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
Merged
merged 2 commits into from
Jul 15, 2019
Merged

RustIntrinsic and PlatformIntrinsic are also the same ABI as Rust #62674

merged 2 commits into from
Jul 15, 2019

Conversation

RalfJung
Copy link
Member

r? @eddyb

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 14, 2019
@eddyb
Copy link
Member

eddyb commented Jul 14, 2019

@bors r+

@bors
Copy link
Collaborator

bors commented Jul 14, 2019

📌 Commit 26528b9 has been approved by eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jul 14, 2019
jonas-schievink
jonas-schievink reviewed Jul 14, 2019
View reviewed changes
src/librustc_mir/interpret/terminator.rs Outdated
@@ -281,7 +281,13 @@ impl<'mir, 'tcx, M: Machine<'mir, 'tcx>> InterpCx<'mir, 'tcx, M> {
}
};
// Rust and RustCall are compatible
Copy link
Contributor

Choose a reason for hiding this comment

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

This is now outdated

@bors
Copy link
Collaborator

bors commented Jul 14, 2019

⌛ Testing commit 26528b9 with merge b1e5e6f4ad7784601f536f7fc091e47be1fa4a93...

@RalfJung
Copy link
Member Author

@bors r- retry

let's fix the comment

@bors bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jul 14, 2019
@RalfJung
Copy link
Member Author

@bors r=eddyb

@bors
Copy link
Collaborator

bors commented Jul 14, 2019

📌 Commit 6c293d8 has been approved by eddyb

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jul 14, 2019
@bors
Copy link
Collaborator

bors commented Jul 15, 2019

⌛ Testing commit 6c293d8 with merge 9bb855c...

bors added a commit that referenced this pull request Jul 15, 2019
@bors
Auto merge of #62674 - RalfJung:miri-abi, r=eddyb
9bb855c 
RustIntrinsic and PlatformIntrinsic are also the same ABI as Rust

r? @eddyb
@bors
Copy link
Collaborator

bors commented Jul 15, 2019

☀️ Test successful - checks-azure, checks-travis, status-appveyor
Approved by: eddyb
Pushing 9bb855c to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 15, 2019
@bors bors merged commit 6c293d8 into rust-lang:master Jul 15, 2019
@RalfJung RalfJung deleted the miri-abi branch July 23, 2019 06:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonas-schievink jonas-schievink jonas-schievink left review comments

@eddyb eddyb eddyb approved these changes

Assignees

@eddyb eddyb

Labels
merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@RalfJung @eddyb @bors @jonas-schievink @rust-highfive