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

Make sure #47772 does not regress #52825

Merged
merged 3 commits into from
Aug 1, 2018
Merged

Make sure #47772 does not regress #52825

merged 3 commits into from
Aug 1, 2018

Conversation

RalfJung
Copy link
Member

Mostly to make my life in #52206 harder.^^

Or should I just add that test there?

@rust-highfive
Copy link
Collaborator

r? @alexcrichton

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

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

@bors: r+ rollup

Either way's fine!

@bors
Copy link
Contributor

bors commented Jul 29, 2018

📌 Commit 90165b8 has been approved by alexcrichton

@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 29, 2018
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 30, 2018
Closed
@RalfJung RalfJung mentioned this pull request Jul 30, 2018
Merged
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 30, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#52825 - RalfJung:codegen, r=alexcrichton
5739542 
Make sure rust-lang#47772 does not regress

Mostly to make my life in rust-lang#52206 harder.^^

Or should I just add that test there?
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 30, 2018
Closed
Mark-Simulacrum added a commit to Mark-Simulacrum/rust that referenced this pull request Jul 30, 2018
@Mark-Simulacrum
Rollup merge of rust-lang#52825 - RalfJung:codegen, r=alexcrichton
0fa7c12 
Make sure rust-lang#47772 does not regress

Mostly to make my life in rust-lang#52206 harder.^^

Or should I just add that test there?
@Mark-Simulacrum Mark-Simulacrum mentioned this pull request Jul 30, 2018
Closed
@RalfJung
Copy link
Member Author

RalfJung commented Jul 31, 2018 •
edited
Loading

@bors r-

This is failing CI on Windows:

C:\projects\rust\build\x86_64-pc-windows-gnu\test\codegen\slice-position-bounds-check\slice-position-bounds-check.ll:13:233: error: CHECK-NOT: string occurred!
define zeroext i1 @position_no_bounds_check([0 x i32]* noalias nonnull %y.0, i64 %y.1, i32* noalias nocapture readonly dereferenceable(4) %x, i32* noalias nocapture readonly dereferenceable(4) %z) unnamed_addr #0 personality i32 (%"panic_unwind::windows::EXCEPTION_RECORD"*, i8*, %"panic_unwind::windows::CONTEXT"*, %"panic_unwind::windows::DISPATCHER_CONTEXT"*)* @rust_eh_personality {
                                                                                                                                                                                                                                        ^
C:\projects\rust\src/test\codegen\slice-position-bounds-check.rs:28:16: note: CHECK-NOT: pattern specified here
 // CHECK-NOT: panic
               ^

Does this mean that the function does panic on Windows, or that Windows IR contains the string "panic" for other reasons? Looks like the former to me. But why would codegen be different on Windows?!?

Anyway I do not even have access to a Windows machine, so the best thing I could so is make the test // ignore-windows and hope that this works on codegen tests. Any other suggestions?

@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 31, 2018
@RalfJung
Copy link
Member Author

Okay I think this should help, thanks @eddyb

@eddyb
Copy link
Member

eddyb commented Jul 31, 2018

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jul 31, 2018

📌 Commit 4ff79f8e521440039538261151f7f2364aef0d32 has been approved by alexcrichton

@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 31, 2018
@RalfJung
Copy link
Member Author

@bors r=alexcrichton

@bors
Copy link
Contributor

bors commented Jul 31, 2018

📌 Commit fb7d8a1 has been approved by alexcrichton

@eddyb
Copy link
Member

eddyb commented Jul 31, 2018

@bors rollup-

pietroalbini added a commit to pietroalbini/rust that referenced this pull request Aug 1, 2018
@pietroalbini
Rollup merge of rust-lang#52825 - RalfJung:codegen, r=alexcrichton
fe4358a 
Make sure rust-lang#47772 does not regress

Mostly to make my life in rust-lang#52206 harder.^^

Or should I just add that test there?
@pietroalbini pietroalbini mentioned this pull request Aug 1, 2018
Merged
bors added a commit that referenced this pull request Aug 1, 2018
@bors
Auto merge of #52937 - pietroalbini:rollup, r=pietroalbini
8c069ce 
Rollup of 30 pull requests

Successful merges:

 - #52340 (Document From trait implementations for OsStr, OsString, CString, and CStr)
 - #52628 (Cleanup some rustdoc code)
 - #52732 (Remove unstable and deprecated APIs)
 - #52745 (Update clippy to latest master)
 - #52771 (Clarify thread::park semantics)
 - #52778 (Improve readability of serialize.rs)
 - #52810 ([NLL] Don't make "fake" match variables mutable)
 - #52821 (pretty print for std::collections::vecdeque)
 - #52822 (Fix From<LocalWaker>)
 - #52824 (Fix -Wpessimizing-move warnings in rustllvm/PassWrapper)
 - #52825 (Make sure #47772 does not regress)
 - #52831 (remove references to AUTHORS.txt file)
 - #52842 (update comment)
 - #52846 (Add timeout to use of `curl` in bootstrap.py.)
 - #52851 (Make the tool_lints actually usable)
 - #52853 (Improve bootstrap help on stages)
 - #52859 (Use Vec::extend in SmallVec::extend when applicable)
 - #52861 (Add targets for HermitCore (https://hermitcore.org) to the Rust compiler and port libstd to it.)
 - #52867 (releases.md: fix 2 typos)
 - #52870 (Implement Unpin for FutureObj and LocalFutureObj)
 - #52876 (run-pass/const-endianness: negate before to_le())
 - #52878 (Fix wrong issue number in the test name)
 - #52883 (Include lifetime in mutability suggestion in NLL messages)
 - #52888 (Use suggestions for shell format arguments)
 - #52904 (NLL: sort diagnostics by span)
 - #52905 (Fix a typo in unsize.rs)
 - #52907 (NLL: On "cannot move out of type" error, print original before rewrite)
 - #52914 (Only run the sparc-abi test on sparc)
 - #52918 (Backport 1.27.2 release notes)
 - #52929 (Update compatibility note for 1.28.0 to be correct)

Failed merges:

r? @ghost
@bors bors merged commit fb7d8a1 into rust-lang:master Aug 1, 2018
@RalfJung RalfJung deleted the codegen branch August 16, 2018 10:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@alexcrichton alexcrichton

Labels
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 @rust-highfive @alexcrichton @bors @eddyb