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

Rollup of 10 pull requests #90105

Closed
wants to merge 24 commits into from

Conversation

matthiaskrgr
Copy link
Member

Successful merges:

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

durin42 and others added 24 commits October 18, 2021 20:19
I'm working on some LLVM patches in concert with a Rust patch, and it's
helping me quite a bit to have this as an option. It doesn't seem that
hard, so I figured I'd formalize it in x.py and send it upstream.
use array explicitly instead of vec for const content (even if optimizer smart enought to remove allocation)
Now explicitly says negative value.
Change `Duration::[try_]from_secs_{f32, f64}` underflow error

The error message now says that it was a negative value.

Fixes rust-lang#89913.
…mulacrum

config: add the option to enable LLVM tests

I'm working on some LLVM patches in concert with a Rust patch, and it's
helping me quite a bit to have this as an option. It doesn't seem that
hard, so I figured I'd formalize it in x.py and send it upstream.
… r=jsha

Add test for line-number setting

The first commit updates the version of the package to be able to have multi-line commands (which looks much nicer for this test).

r? `@jsha`
Update the minimum external LLVM to 11

With this change, we'll have stable support for LLVM 11..=13.
For reference, the previous increase to LLVM 10 was rust-lang#83387.

r? `@nagisa` `@nikic`
Remove hir::map::blocks and use FnKind instead

The principal tool is `FnLikeNode`, which is not often used and can be easily implemented using `rustc_hir::intravisit::FnKind`.
2229 migrations small cleanup

This removes needless `format!`'ing of empty string and replaces `vec!` with const strings with const array.
…ntry-reexported-macro, r=notriddle

Add test for duplicated sidebar entries for reexported macro

Fixes rust-lang#90015.

r? `@notriddle`
…l-missing-doc-code-examples, r=jyn514

Add test to ensure that the missing_doc_code_examples is not triggered on foreign trait implementations

Fixes rust-lang#76450.

r? `@jyn514`
…olnay

Fix MIRI UB in `Vec::swap_remove`

Fixes rust-lang#90055

I find it weird that `Vec::swap_remove` read the last element to the stack just to immediately put it back in the `Vec` in place of the one at index `index`. It seems much more natural to me to just read the element at position `index` and then move the last element in its place. I guess this might also slightly improve codegen.
@rustbot rustbot added the rollup A PR which is a rollup label Oct 20, 2021
@matthiaskrgr
Copy link
Member Author

@bors r+ p=10 rollup=never

@bors
Copy link
Contributor

bors commented Oct 20, 2021

📌 Commit 2c31c96 has been approved by matthiaskrgr

@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 Oct 20, 2021
@bors
Copy link
Contributor

bors commented Oct 20, 2021

⌛ Testing commit 2c31c96 with merge 318e35595e958906df769df3c81eb5b18b06f0d6...

@rust-log-analyzer
Copy link
Collaborator

The job aarch64-gnu failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)
1 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:11:15
+   --> $DIR/srcloc.rs:10:15
3    |
4 LL |         asm!("invalid_instruction");

11    |     ^
12 
13 error: unrecognized instruction mnemonic
---
61 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:38:14
+   --> $DIR/srcloc.rs:37:14
63    |
64 LL |         asm!(concat!("invalid", "_", "instruction"));

71    |     ^
72 
73 error: unrecognized instruction mnemonic
---
109 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:62:13
+   --> $DIR/srcloc.rs:61:13
111    |
112 LL |             concat!("invalid", "_", "instruction"),

119    | ^
120 
121 error: unrecognized instruction mnemonic
121 error: unrecognized instruction mnemonic
-   --> $DIR/srcloc.rs:69:13
+   --> $DIR/srcloc.rs:68:13
123    |
124 LL |             concat!("invalid", "_", "instruction"),

131    | ^
132 
133 error: unrecognized instruction mnemonic
---
To only update this specific test, also pass `--test-args asm/aarch64/srcloc.rs`

error: 1 errors occurred comparing output.
status: exit status: 1
command: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/asm/aarch64/srcloc.rs" "-Zthreads=1" "--target=aarch64-unknown-linux-gnu" "--error-format" "json" "-Ccodegen-units=1" "-Zui-testing" "-Zdeduplicate-diagnostics=no" "-Zemit-future-incompat-report" "-C" "prefer-dynamic" "--out-dir" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/aarch64/srcloc" "-A" "unused" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-Ccodegen-units=1" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/aarch64/srcloc/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:10:15
   |
LL |         asm!("invalid_instruction");
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:14:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:19:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:25:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:32:13
   |
LL |             invalid_instruction
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:13
LL |             invalid_instruction
   |             ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:37:14
   |
LL |         asm!(concat!("invalid", "_", "instruction"));
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:41:14
   |
LL |             "invalid_instruction",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:47:14
   |
LL |             "invalid_instruction",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:54:14
   |
LL |             "invalid_instruction",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:61:13
   |
LL |             concat!("invalid", "_", "instruction"),
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:68:13
   |
LL |             concat!("invalid", "_", "instruction"),
   |
note: instantiated into assembly here
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:75:14
   |
LL |             "invalid_instruction1",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:76:14
   |
LL |             "invalid_instruction2",
   |              ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:82:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:82:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:91:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:91:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:95:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:3:1
LL | invalid_instruction3
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:95:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:4:1
LL | invalid_instruction4
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:106:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:1:2
LL |     invalid_instruction1
   |     ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:106:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:2:1
LL | invalid_instruction2
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:110:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:4:1
LL | invalid_instruction3
   | ^

error: unrecognized instruction mnemonic
error: unrecognized instruction mnemonic
  --> /checkout/src/test/ui/asm/aarch64/srcloc.rs:110:13
   |
LL |             concat!(
   |             ^
   |
note: instantiated into assembly here
  --> <inline asm>:5:1
LL | invalid_instruction4
   | ^

error: aborting due to 23 previous errors
---
test result: FAILED. 12167 passed; 1 failed; 144 ignored; 0 measured; 0 filtered out; finished in 138.11s



command did not execute successfully: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage0-tools-bin/compiletest" "--compile-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib" "--run-lib-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/lib/rustlib/aarch64-unknown-linux-gnu/lib" "--rustc-path" "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "--src-base" "/checkout/src/test/ui" "--build-base" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui" "--stage-id" "stage2-aarch64-unknown-linux-gnu" "--suite" "ui" "--mode" "ui" "--target" "aarch64-unknown-linux-gnu" "--host" "aarch64-unknown-linux-gnu" "--llvm-filecheck" "/checkout/obj/build/aarch64-unknown-linux-gnu/llvm/build/bin/FileCheck" "--host-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--target-rustcflags" "-Crpath -O -Cdebuginfo=0  -Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "--docck-python" "/usr/bin/python3" "--lldb-python" "/usr/bin/python3" "--gdb" "/usr/bin/gdb" "--llvm-version" "13.0.0-rust-1.58.0-nightly" "--llvm-components" "aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen core coroutines coverage debuginfocodeview debuginfodwarf debuginfogsym debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwp engine executionengine extensions filecheck frontendopenacc frontendopenmp fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo instcombine instrumentation interfacestub interpreter ipo irreader jitlink libdriver lineeditor linker lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts object objectyaml option orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target textapi transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info xray" "--cc" "" "--cxx" "" "--cflags" "" "--adb-path" "adb" "--adb-test-dir" "/data/tmp/work" "--android-cross-path" "" "--channel" "nightly" "--color" "always"


Build completed unsuccessfully in 0:19:45

@bors
Copy link
Contributor

bors commented Oct 20, 2021

💔 Test failed - checks-actions

@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 Oct 20, 2021
@matthiaskrgr matthiaskrgr deleted the rollup-7vlpcaa branch November 20, 2021 15:03
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.