Rollup of 5 pull requests #59582

Centril · 2019-03-31T12:35:10Z

Successful merges:

libstd: deny(elided_lifetimes_in_paths) #58828 (libstd: deny(elided_lifetimes_in_paths))
Mention no merge policy in the CONTRIBUTING guide #59234 (Mention no merge policy in the CONTRIBUTING guide)
Include bounds in generic re-ordering diagnostic #59572 (Include bounds in generic re-ordering diagnostic)
Distinguish message for external macros depending on error level #59574 (Distinguish message for external macros depending on error level)
Fix LLVM IR generated for C-variadic arguments #59577 (Fix LLVM IR generated for C-variadic arguments)

Failed merges:

Remove unnecessary comment

This commit extends the existing generic re-ordering diagnostic to include any bounds on the generic parameter, thus producing correct suggestions.

This commit updates the generic parameter re-ordering diagnostic to only mention const generics if the feature is enabled.

It is possible to create malformed LLVM IR given variadic arguments that are aggregate types. This occurs due to improper tracking of the current argument in the functions list of arguments.

@oli-obk

…ths-libstd, r=oli-obk libstd: deny(elided_lifetimes_in_paths) r? @oli-obk

…i-obk Mention `no merge policy` in the CONTRIBUTING guide Issue: rust-lang#59233

@estebank

Include bounds in generic re-ordering diagnostic Fixes rust-lang#59508. r? @estebank cc @varkor

@estebank

…ing, r=Centril Distinguish message for external macros depending on error level fixes rust-lang#57716 (I picked you because assigned to this issue.) r? @estebank

Fix LLVM IR generated for C-variadic arguments It is possible to create malformed LLVM IR given variadic arguments that are aggregate types. This occurs due to improper tracking of the current argument in the functions list of arguments. Fixes: rust-lang#58881

Centril · 2019-03-31T12:35:19Z

@bors r+ p=5

bors · 2019-03-31T12:35:20Z

📌 Commit 3d308ee has been approved by Centril

bors · 2019-03-31T12:35:39Z

⌛ Testing commit 3d308ee with merge 9eb52ff643a2f2da49b1240e0d5ee2782c6b1128...

bors · 2019-03-31T14:08:08Z

💔 Test failed - checks-travis

rust-highfive · 2019-03-31T14:08:09Z

The job dist-i586-gnu-i586-i686-musl 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.

[01:28:44] failures:
[01:28:44] 
[01:28:44] ---- [codegen] codegen/c-variadic.rs stdout ----
[01:28:44] 
[01:28:44] error: verification with 'FileCheck' failed
[01:28:44] status: exit code: 1
[01:28:44] command: "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--input-file" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/c-variadic/c-variadic.ll" "/checkout/src/test/codegen/c-variadic.rs"
[01:28:44] ------------------------------------------
[01:28:44] 
[01:28:44] ------------------------------------------
[01:28:44] stderr:
[01:28:44] stderr:
[01:28:44] ------------------------------------------
[01:28:44] /checkout/src/test/codegen/c-variadic.rs:77:12: error: CHECK: expected string not found in input
[01:28:44]  // CHECK: call void (i32, ...) @foreign_c_variadic_0(i32 0, { i64, i64 } %{{.*}}, %Bar* byval noalias nocapture dereferenceable(24) %{{.*}})
[01:28:44]            ^
[01:28:44]            ^
[01:28:44] /checkout/obj/build/x86_64-unknown-linux-gnu/test/codegen/c-variadic/c-variadic.ll:1066:2: note: scanning from here
[01:28:44]  br label %bb4
[01:28:44] 
[01:28:44] ------------------------------------------
[01:28:44] 
[01:28:44] thread '[codegen] codegen/c-variadic.rs' panicked at 'explicit panic', src/tools/compiletest/src/runtest.rs:3422:9
---
[01:28:44] test result: FAILED. 119 passed; 1 failed; 14 ignored; 0 measured; 0 filtered out
[01:28:44] 
[01:28:44] 
[01:28:44] 
[01:28:44] 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/i586-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-i586-unknown-linux-gnu" "--mode" "codegen" "--target" "i586-unknown-linux-gnu" "--host" "x86_64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--linker" "cc" "--host-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/x86_64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Zunstable-options  -Lnative=/checkout/obj/build/i586-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" "8.0.0-rust-1.35.0-nightly\n" "--cc" "" "--cxx" "" "--cflags" "" "--llvm-components" "" "--llvm-cxxflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--color" "always"
[01:28:44] 
[01:28:44] 
[01:28:44] failed to run: /checkout/obj/build/bootstrap/debug/bootstrap test --target i586-unknown-linux-gnu,i686-unknown-linux-musl
[01:28:44] Build completed unsuccessfully in 1:25:58
---
travis_time:end:0ae8b1e0:start=1554041175929839217,finish=1554041175936917704,duration=7078487
travis_fold:end:after_failure.3
travis_fold:start:after_failure.4
travis_time:start:001aa11f
$ ln -s . checkout && for CORE in obj/cores/core.*; do EXE=$(echo $CORE | sed 's|obj/cores/core\.[0-9]*\.!checkout!\(.*\)|\1|;y|!|/|'); if [ -f "$EXE" ]; then printf travis_fold":start:crashlog\n\033[31;1m%s\033[0m\n" "$CORE"; gdb --batch -q -c "$CORE" "$EXE" -iex 'set auto-load off' -iex 'dir src/' -iex 'set sysroot .' -ex bt -ex q; echo travis_fold":"end:crashlog; fi; done || true
travis_fold:end:after_failure.4
travis_fold:start:after_failure.5
travis_time:start:0228e220
travis_time:start:0228e220
$ cat ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers || true
cat: ./obj/build/x86_64-unknown-linux-gnu/native/asan/build/lib/asan/clang_rt.asan-dynamic-i386.vers: No such file or directory
travis_fold:end:after_failure.5
travis_fold:start:after_failure.6
travis_time:start:051d6c79
$ dmesg | grep -i kill

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)

stepnivlk and others added 15 commits March 16, 2019 19:16

Mention no merge policy in the CONTRIBUTING guide

a4b67ee

Distinguish depending on error level

45c82ab

Remove unnecessary comment

Include bounds in generic reordering diagnostic.

3829746

This commit extends the existing generic re-ordering diagnostic to include any bounds on the generic parameter, thus producing correct suggestions.

Only mention const generics if enabled.

0270d56

This commit updates the generic parameter re-ordering diagnostic to only mention const generics if the feature is enabled.

Fix LLVM IR generated for C-variadic arguments

9095feb

It is possible to create malformed LLVM IR given variadic arguments that are aggregate types. This occurs due to improper tracking of the current argument in the functions list of arguments.

libstd: deny(elided_lifetimes_in_paths)

379c380

libstd: deny(elided_lifetimes_in_paths), fixes in cloudabi

6f4df8c

libstd: deny(elided_lifetimes_in_paths), fixes in wasi

c5d6091

libstd: deny(elided_lifetimes_in_paths), fixes in sgx

351a20c

libstd: deny(elided_lifetimes_in_paths), fixes in redox

1d9508a

Rollup merge of rust-lang#58828 - Centril:deny-elided_lifetimes_in_pa…

c60e455

…ths-libstd, r=oli-obk libstd: deny(elided_lifetimes_in_paths) r? @oli-obk

Rollup merge of rust-lang#59234 - stepnivlk:add-no_merge_policy, r=ol…

5cffe3a

…i-obk Mention `no merge policy` in the CONTRIBUTING guide Issue: rust-lang#59233

Rollup merge of rust-lang#59572 - davidtwco:issue-59508, r=varkor

4b547e3

Include bounds in generic re-ordering diagnostic Fixes rust-lang#59508. r? @estebank cc @varkor

Rollup merge of rust-lang#59574 - JohnTitor:distinguish-error-vs-warn…

6ee2c10

…ing, r=Centril Distinguish message for external macros depending on error level fixes rust-lang#57716 (I picked you because assigned to this issue.) r? @estebank

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 31, 2019

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 Mar 31, 2019

Centril closed this Mar 31, 2019

Centril deleted the rollup branch March 31, 2019 14:09

Centril mentioned this pull request Mar 31, 2019

Fix LLVM IR generated for C-variadic arguments #59577

Merged

Centril added the rollup A PR which is a rollup label Oct 24, 2019

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 5 pull requests #59582

Rollup of 5 pull requests #59582

Centril commented Mar 31, 2019

Centril commented Mar 31, 2019

bors commented Mar 31, 2019

bors commented Mar 31, 2019

bors commented Mar 31, 2019

rust-highfive commented Mar 31, 2019

Rollup of 5 pull requests #59582

Rollup of 5 pull requests #59582

Conversation

Centril commented Mar 31, 2019

Centril commented Mar 31, 2019

bors commented Mar 31, 2019

bors commented Mar 31, 2019

bors commented Mar 31, 2019

rust-highfive commented Mar 31, 2019