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

Pass around i1 as is instead of going through u8 #50277

Closed
wants to merge 1 commit into from

Conversation

nox
Copy link
Contributor

@nox nox commented Apr 27, 2018

No description provided.

@rust-highfive
Copy link
Collaborator

r? @petrochenkov

(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 Apr 27, 2018
@nox
Copy link
Contributor Author

nox commented Apr 27, 2018

Cc @rkruppe
r? @eddyb
@bors-servo try

@rust-highfive rust-highfive assigned eddyb and unassigned petrochenkov Apr 27, 2018
@bors
Copy link
Contributor

bors commented Apr 27, 2018

⌛ Trying commit 666ddd8 with merge b288d56...

bors added a commit that referenced this pull request Apr 27, 2018
 Pass around i1 as is instead of going through u8
let v = base::from_immediate(&bx, v);
if common::val_ty(v) == Type::i1(bx.cx) {
v = bx.zext(v, Type::i8(bx.cx))
}
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Am not sure about this, but I feel like boolean arrays should also use memset when they can, right?

Copy link
Member

Choose a reason for hiding this comment

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

Indeed.

@bors
Copy link
Contributor

bors commented Apr 27, 2018

☀️ Test successful - status-travis
State: approved= try=True

@eddyb
Copy link
Member

eddyb commented Apr 27, 2018

cc @Mark-Simulacrum We're curious about a perf run here.

@Mark-Simulacrum
Copy link
Member

Perf queued.

@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (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.
[00:57:22] .............................................................................ii.....................
[00:58:16] .........................................i....................................................i.ii..
[00:58:19] .....test [run-pass] run-pass/saturating-float-casts.rs has been running for over 60 seconds
[00:59:02] ...............................................................................................
[00:59:20] ..iiiiiii...........................................................................................
[01:00:04] ....................................................................................................
[01:00:23] ...........................................................................
[01:00:23] test result: ok. 2956 passed; 0 failed; 19 ignored; 0 measured; 0 filtered out
[01:00:23] 
---
[01:01:48] ....................................................................................................
[01:01:58] ....................................................................................................
[01:02:10] ....................................................................................................
[01:02:19] ...i................................................................................................
[01:02:25] .i..ii................................................test [compile-fail] compile-fail/issue-22638.rs has been running for over 60 seconds
[01:02:38] ....................................................................................................
[01:02:46] ....................................................................................................
[01:02:54] ...................................................................i................................
[01:03:04] ............i.......................................................................................
---
Testing rustc_borrowck stage1 (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:29:24]     Finished release [optimized] target(s) in 0.0 secs
[01:29:24] 
[01:29:24] 
[01:29:24] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/bin/cargo" "test" "--target" "x86_64-unknown-linux-gnu" "--release" "--locked" "--color" "always" "--features" " jemalloc" "--manifest-path" "/checkout/src/rustc/Cargo.toml" "-p" "rustc_borrowck" "--" "--quiet"
[01:29:24] expected success, got: signal: 9
[01:29:24] 
[01:29:24] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:29:24] Build completed unsuccessfully in 0:43:43
[01:29:24] Build completed unsuccessfully in 0:43:43
[01:29:24] make: *** [check] Error 1
[01:29:24] Makefile:58: recipe for target 'check' failed

The command "stamp sh -x -c "$RUN_SCRIPT"" exited with 2.
travis_time:start:037b2c88
$ date && (curl -fs --head https://google.com | grep ^Date: | sed 's/Date: //g' || true)
---
travis_fold:start:after_failure.4
travis_time:start:0079fa64
$ dmesg | grep -i kill
[   11.137842] init: failsafe main process (1093) killed by TERM signal
[ 5435.594053]  [<ffffffff8108c79b>] ? do_tkill+0x8b/0xa0
travis_fold:end:after_failure.4

Done. Your build exited with 1.

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)

@nox
Copy link
Contributor Author

nox commented May 2, 2018

I can't reproduce that locally, I wonder if this is an intermittent, or a failure specific to using LLVM 3.9.

@nox
Copy link
Contributor Author

nox commented May 2, 2018

Seems like this was indeed an intermittent.

@eddyb
Copy link
Member

eddyb commented May 2, 2018

@bors r+

@bors
Copy link
Contributor

bors commented May 2, 2018

📌 Commit d605b3d 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 May 2, 2018
@@ -359,7 +352,7 @@ impl<'tcx> LayoutLlvmExt<'tcx> for TyLayout<'tcx> {
};
let scalar = [a, b][index];

// Make sure to return the same type `immediate_llvm_type` would,
// Make sure to return the same type `llvm_type` would,
Copy link
Member

Choose a reason for hiding this comment

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

Hmm, looking at this again, the special-case for bool could go better in scalar_llvm_type_at, which would let you remove this whole comment too.

@eddyb
Copy link
Member

eddyb commented May 2, 2018

@bors r+

@bors
Copy link
Contributor

bors commented May 2, 2018

📌 Commit 4eb72a5 has been approved by eddyb

@bors
Copy link
Contributor

bors commented May 2, 2018

⌛ Testing commit 4eb72a58711d6a9c587e2a76b231b9bb5fcb69d3 with merge d14b569c45bf4364eb727488157076212597fdc4...

@bors
Copy link
Contributor

bors commented May 2, 2018

💔 Test failed - status-travis

@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 May 2, 2018
@kennytm kennytm removed the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 2, 2018
@eddyb
Copy link
Member

eddyb commented May 2, 2018

@bors r+

@bors
Copy link
Contributor

bors commented May 2, 2018

📌 Commit 1c95afc 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 May 2, 2018
@bors
Copy link
Contributor

bors commented May 3, 2018

⌛ Testing commit 1c95afcbb6d2e4efad703a71fab624fa0ff34af9 with merge 15b212b19433edee1f61bcf6e85516d08020398a...

@bors
Copy link
Contributor

bors commented May 3, 2018

💔 Test failed - status-appveyor

@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 May 3, 2018
@rust-highfive

This comment has been minimized.

@kennytm kennytm 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-review Status: Awaiting review from the assignee but also interested parties. labels May 3, 2018
@eddyb
Copy link
Member

eddyb commented May 3, 2018

@bors r+

@bors
Copy link
Contributor

bors commented May 3, 2018

📌 Commit 0958407 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 May 3, 2018
@rust-highfive
Copy link
Collaborator

The job x86_64-gnu-llvm-3.9 of your PR failed on Travis (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.
Check compiletest suite=codegen mode=codegen (x86_64-unknown-linux-gnu -> x86_64-unknown-linux-gnu)
[01:02:46] 
[01:02:46] running 78 tests
------------------
[01:02:50] /checkout/src/test/codegen/function-arguments.rs:154:11: error: expected string not found in input
[01:02:50] // CHECK: { i1, i8 } @enum_id_2(i1 zeroext %x.0, i8 %x.1)
[01:02:50]           ^
[01:02:50] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/function-arguments.ll:400:52: note: scanning from here
[01:02:50] define { i16, i16 } @enum_id_1(i16 %x.0, i16 %x.1) unnamed_addr #0 {
[01:02:50]                                                    ^
[01:02:50] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/function-arguments.ll:402:19: note: possible intended match here
[01:02:50]  %0 = insertvalue { i16, i16 } undef, i16 %x.0, 0
[01:02:50] 
[01:02:50] ------------------------------------------
[01:02:50] 
[01:02:50] thread '[codegen] codegen/function-arguments.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:2965:9
[01:02:50] thread '[codegen] codegen/function-arguments.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:2965:9
[01:02:50] note: Run with `RUST_BACKTRACE=1` for a backtrace.
[01:02:50] 
[01:02:50] ---- [codegen] codegen/repeat-trusted-len.rs stdout ----
[01:02:50]  
[01:02:50] error: verification with 'FileCheck' failed
[01:02:50] status: exit code: 1
[01:02:50] command: "/usr/lib/llvm-3.9/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/repeat-trusted-len.ll" "/checkout/src/test/codegen/repeat-trusted-len.rs"
[01:02:50] ------------------------------------------
[01:02:50] 
[01:02:50] ------------------------------------------
[01:02:50] stderr:
[01:02:50] stderr:
[01:02:50] ------------------------------------------
[01:02:50] /checkout/src/test/codegen/repeat-trusted-len.rs:26:11: error: expected string not found in input
[01:02:50] // CHECK: call void @llvm.memset.p0i8.[[USIZE]](i8* {{(nonnull )?}}%{{[0-9]+}}, i8 42, [[USIZE]] 100000, i32 1, i1 false)
[01:02:50]           ^
[01:02:50] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/repeat-trusted-len.ll:36:33: note: scanning from here
[01:02:50] define void @repeat_take_collect(%"alloc::vec::Vec<u8>"* noalias nocapture sret dereferenceable(24)) unnamed_addr #2 personality i32 (i32, i32, i64, %"unwind::libunwind::_Unwind_Exception"*, %"unwind::libunwind::_Unwind_Context"*)* @rust_eh_personality {
[01:02:50]                                 ^
[01:02:50] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/repeat-trusted-len.ll:36:33: note: with variable "USIZE" equal to "i64"
[01:02:50] define void @repeat_take_collect(%"alloc::vec::Vec<u8>"* noalias nocapture sret dereferenceable(24)) unnamed_addr #2 personality i32 (i32, i32, i64, %"unwind::libunwind::_Unwind_Exception"*, %"unwind::libunwind::_Unwind_Context"*)* @rust_eh_personality {
[01:02:50]                                 ^
[01:02:50] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/repeat-trusted-len.ll:36:33: note: with variable "USIZE" equal to "i64"
[01:02:50] define void @repeat_take_collect(%"alloc::vec::Vec<u8>"* noalias nocapture sret dereferenceable(24)) unnamed_addr #2 personality i32 (i32, i32, i64, %"unwind::libunwind::_Unwind_Exception"*, %"unwind::libunwind::_Unwind_Context"*)* @rust_eh_personality {
[01:02:50] 
[01:02:50] ------------------------------------------
[01:02:50] 
[01:02:50] thread '[codegen] codegen/repeat-trusted-len.rs' panicked at 'explicit panic', tools/compiletest/src/runtest.rs:2965:9
---
[01:02:50] test result: FAILED. 56 passed; 2 failed; 20 ignored; 0 measured; 0 filtered out
[01:02:50] 
[01:02:50] 
[01:02:50] 
[01:02:50] command did not execute successfully: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/codegen" "--build-base" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen" "--stage-id" "stage2-x86_64-unknown-linux-gnu" "--mode" "codegen" "--target" "x86_64-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/usr/lib/llvm-3.9/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Zunstable-options " "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python2.7" "--lldb-python" "/usr/bin/python2.7" "--gdb" "/usr/bin/gdb" "--quiet" "--llvm-version" "3.9.1\n" "--system-llvm" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:02:50] 
[01:02:50] 
[01:02:50] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test
[01:02:50] Build completed unsuccessfully in 0:17:56
[01:02:50] Build completed unsuccessfully in 0:17:56
[01:02:50] make: *** [check] Error 1
[01:02:50] Makefile:58: recipe for target 'check' failed
az72e5d/s-f0oudboefg-1fcypi6-1ujokh614sjd2
112944 ./obj/build/x86_64-unknown-linux-gnu/test/mir-opt
111764 ./obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu
111760 ./obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release
107788 ./obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps
107788 ./obj/build/x86_64-unknown-linux-gnu/stage0-tools/x86_64-unknown-linux-gnu/release/deps
102840 ./obj/build/bootstrap/debug/incremental/bootstrap-2wettvttcntnm
102836 ./obj/build/bootstrap/debug/incremental/bootstrap-2wettvttcntnm/s-f0ovk3dgxi-1iewviq-3sijyc9m9vnmm
98300 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/incremental
92672 ./obj/build/x86_64-unknown-linux-gnu/stage1
92648 ./obj/build/x86_64-unknown-linux-gnu/stage1/lib
90800 ./obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/incremental/core-31lccp6wy7orz
90800 ./obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/incremental/core-31lccp6wy7orz
90796 ./obj/build/x86_64-unknown-linux-gnu/stage1-std/x86_64-unknown-linux-gnu/release/incremental/core-31lccp6wy7orz/s-f0ovhl2rss-bssmga-df2ow3h1s6v7
86668 ./obj/build/x86_64-unknown-linux-gnu/doc/core
81076 ./obj/build/x86_64-unknown-linux-gnu/doc/std
80744 ./obj/build/x86_64-unknown-linux-gnu/stage1-rustc/x86_64-unknown-linux-gnu/release/deps
79068 ./obj/build/x86_64-unknown-linux-gnu/stage0-sysroot

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)

@kennytm
Copy link
Member

kennytm commented May 3, 2018

@bors r- ↑

@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 May 3, 2018
@pietroalbini
Copy link
Member

Ping from triage @nox! It's been a while since we heard from you, will you have time to work on this again soon?

@bors
Copy link
Contributor

bors commented May 12, 2018

☔ The latest upstream changes (presumably #50249) made this pull request unmergeable. Please resolve the merge conflicts.

@pietroalbini
Copy link
Member

Ping from triage @nox! It's been a while since we heard from you, will you have time to work on this again soon?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants