Skip to content

Conversation

Centril
Copy link
Contributor

@Centril Centril commented Sep 28, 2019

Successful merges:

Failed merges:

r? @ghost

nikomatsakis and others added 30 commits September 13, 2019 15:15
Following up on [1] and [2], this PR adds differntiation for aarch64 bare-metal targets between versions with and without hardware floating point enabled. This streamlines the target naming with other existing ARM targets and provides the user clear indication if he is getting float or non-float for his bare-metal target. [1] rust-lang#60135 (comment) [2] rust-embedded/wg#230 Closes: rust-embedded/wg#230
This can cause cycles as `ConstProp` uses `layout_of` which, for generators, uses `optimized_mir` which runs `ConstProp`.
This allows us to avoid changing things directly in the miri engine just for const prop.
…li-obk Deduplicate some code between miri and const prop r? @oli-obk
…on-E0531, r=Centril Add Long error explanation for E0531 Part of rust-lang#61137.
…e-tests, r=nikomatsakis Bugfix/rfc 2451 rerebalance tests r? @nikomatsakis Fixes rust-lang#64412 Depends/Contains on rust-lang#64414 cc rust-lang#55437 and rust-lang#63599
…=Amanieu Differentiate AArch64 bare-metal targets between hf and non-hf. CC @parched, kindly request you to review. ~~Note: This change breaks code that uses the target `aarch64-unknown-none` for the sake of clearer naming as discussed in the links posted below. A search on github reveals that code using `aarch64-unknown-none` is almost exclusively forked from our embedded WG's OS tutorials repo at https://github.com/rust-embedded/rust-raspi3-OS-tutorials, for which the target was originally created.~~ ~~I will adapt this repo to the new target name asap once this PR would go upstream. The minor annoyance for the forks to break temporarily should be acceptable for the sake of introducing a better differentiation now before it is too late. Also, the break would only happen upon updating the toolchain, giving the user a good hint at what has happened.~~ ---------- Patch commit message: Following up on [1] and [2], this PR adds differntiation for aarch64 bare-metal targets between versions with and without floating point enabled. This streamlines the target naming with other existing ARM targets and provides the user clear indication if he is getting float or non-float for his bare-metal target. [1] rust-lang#60135 (comment) [2] rust-embedded/wg#230 Closes: rust-embedded/wg#230
…-E0734, r=estebank Add E0734 and its long explanation Part of rust-lang#61137
@Centril
Copy link
Contributor Author

Centril commented Sep 28, 2019

@bors r+ p=5 rollup=never

@bors
Copy link
Collaborator

bors commented Sep 28, 2019

📌 Commit d4d3d97 has been approved by Centril

@bors bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Sep 28, 2019
@bors
Copy link
Collaborator

bors commented Sep 28, 2019

⌛ Testing commit d4d3d97 with merge d8bd127e32c0052c6595cb5de58f014344d03418...

@rust-highfive
Copy link
Contributor

The job i686-gnu-nopt of your PR failed (pretty log, raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.
2019-09-28T10:51:51.8624733Z test [mir-opt] mir-opt/while-storage.rs ... ok 2019-09-28T10:51:51.8624855Z 2019-09-28T10:51:51.8624936Z failures: 2019-09-28T10:51:51.8624970Z 2019-09-28T10:51:51.8625262Z ---- [mir-opt] mir-opt/const_prop/read_immutable_static.rs stdout ---- 2019-09-28T10:51:51.8625337Z [ERROR compiletest::runtest] None 2019-09-28T10:51:51.8625655Z thread '[mir-opt] mir-opt/const_prop/read_immutable_static.rs' panicked at 'Did not find expected line, error: Mismatch in lines 2019-09-28T10:51:51.8625780Z Current block: None 2019-09-28T10:51:51.8625871Z Actual Line: " _4 = CheckedAdd(move _2, move _3);" 2019-09-28T10:51:51.8625965Z Expected Line: " _1 = Add(move _2, move _3);" 2019-09-28T10:51:51.8626043Z Test Name: rustc.main.ConstProp.before.mir 2019-09-28T10:51:51.8626174Z ... (elided) 2019-09-28T10:51:51.8626247Z bb0: { 2019-09-28T10:51:51.8626296Z ... (elided) 2019-09-28T10:51:51.8626296Z ... (elided) 2019-09-28T10:51:51.8626369Z _2 = (FOO: u8); 2019-09-28T10:51:51.8626425Z ... (elided) 2019-09-28T10:51:51.8626496Z _3 = (FOO: u8); 2019-09-28T10:51:51.8626571Z _1 = Add(move _2, move _3); 2019-09-28T10:51:51.8626882Z ... (elided) 2019-09-28T10:51:51.8627014Z Actual: 2019-09-28T10:51:51.8627280Z fn main() -> () { 2019-09-28T10:51:51.8627341Z let mut _0: (); 2019-09-28T10:51:51.8627415Z let _1: u8; 2019-09-28T10:51:51.8627415Z let _1: u8; 2019-09-28T10:51:51.8627469Z let mut _2: u8; 2019-09-28T10:51:51.8627758Z let mut _3: u8; 2019-09-28T10:51:51.8627815Z let mut _4: (u8, bool); 2019-09-28T10:51:51.8627891Z scope 1 { 2019-09-28T10:51:51.8628013Z bb0: { 2019-09-28T10:51:51.8628084Z StorageLive(_1); 2019-09-28T10:51:51.8628229Z StorageLive(_2); 2019-09-28T10:51:51.8628229Z StorageLive(_2); 2019-09-28T10:51:51.8628313Z _2 = (FOO: u8); 2019-09-28T10:51:51.8628369Z StorageLive(_3); 2019-09-28T10:51:51.8628444Z _3 = (FOO: u8); 2019-09-28T10:51:51.8628503Z _4 = CheckedAdd(move _2, move _3); 2019-09-28T10:51:51.8628823Z assert(!move (_4.1: bool), "attempt to add with overflow") -> bb1; 2019-09-28T10:51:51.8628967Z bb1: { 2019-09-28T10:51:51.8628967Z bb1: { 2019-09-28T10:51:51.8629037Z _1 = move (_4.0: u8); 2019-09-28T10:51:51.8629096Z StorageDead(_3); 2019-09-28T10:51:51.8629170Z StorageDead(_2); 2019-09-28T10:51:51.8629226Z _0 = (); 2019-09-28T10:51:51.8629524Z StorageDead(_1); 2019-09-28T10:51:51.8629659Z } 2019-09-28T10:51:51.8629659Z } 2019-09-28T10:51:51.8629709Z bb2 (cleanup): { 2019-09-28T10:51:51.8629781Z resume; 2019-09-28T10:51:51.8631030Z }', src/tools/compiletest/src/runtest.rs:3282:13 2019-09-28T10:51:51.8631169Z note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace. 2019-09-28T10:51:51.8631236Z 2019-09-28T10:51:51.8631273Z 2019-09-28T10:51:51.8631273Z 2019-09-28T10:51:51.8631353Z failures: 2019-09-28T10:51:51.8631668Z [mir-opt] mir-opt/const_prop/read_immutable_static.rs 2019-09-28T10:51:51.8632057Z test result: FAILED. 56 passed; 1 failed; 0 ignored; 0 measured; 0 filtered out 2019-09-28T10:51:51.8632125Z 2019-09-28T10:51:51.8632183Z 2019-09-28T10:51:51.8632219Z 2019-09-28T10:51:51.8632219Z 2019-09-28T10:51:51.8634285Z command did not execute successfully: "/checkout/obj/build/i686-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/i686-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/i686-unknown-linux-gnu/stage2/lib/rustlib/i686-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/i686-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/mir-opt" "--build-base" "/checkout/obj/build/i686-unknown-linux-gnu/test/mir-opt" "--stage-id" "stage2-i686-unknown-linux-gnu" "--mode" "mir-opt" "--target" "i686-unknown-linux-gnu" "--host" "i686-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/i686-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -Cdebuginfo=0 -Zunstable-options -Lnative=/checkout/obj/build/i686-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--llvm-version" "9.0.0-rust-1.40.0-dev\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always" 2019-09-28T10:51:51.8635244Z 2019-09-28T10:51:51.8635278Z 2019-09-28T10:51:51.8635571Z thread 'main' panicked at 'Some tests failed', src/tools/compiletest/src/main.rs:537:22 2019-09-28T10:51:51.8637826Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test 2019-09-28T10:51:51.8637826Z failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test 2019-09-28T10:51:51.8637939Z Build completed unsuccessfully in 1:25:14 2019-09-28T10:51:51.8687360Z == clock drift check == 2019-09-28T10:51:51.8705776Z local time: Sat Sep 28 10:51:51 UTC 2019 2019-09-28T10:51:52.1406634Z network time: Sat, 28 Sep 2019 10:51:52 GMT 2019-09-28T10:51:52.1411523Z == end clock drift check == 2019-09-28T10:51:55.9695338Z ##[error]Bash exited with code '1'. 2019-09-28T10:51:55.9737896Z ##[section]Starting: Upload CPU usage statistics 2019-09-28T10:51:55.9745279Z ============================================================================== 2019-09-28T10:51:55.9745566Z Task : Bash 2019-09-28T10:51:55.9745643Z Description : Run a Bash script on macOS, Linux, or Windows 

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@bors
Copy link
Collaborator

bors commented Sep 28, 2019

💔 Test failed - checks-azure

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 28, 2019
@Centril Centril closed this Sep 28, 2019
@Centril Centril deleted the rollup-dina8xx branch September 28, 2019 18:34
@Centril Centril added the rollup A PR which is a rollup label Oct 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

rollup A PR which is a rollup S-waiting-on-review Status: Awaiting review from the assignee but also interested parties.

8 participants