Rollup of 4 pull requests #91117

matthiaskrgr · 2021-11-21T23:48:26Z

Successful merges:

Unwinding support for inline assembly #88439 (Unwinding support for inline assembly)
Move scripts on the rustdoc template into head and apply the defer attribute #90872 (Move scripts on the rustdoc template into head and apply the defer attribute)
Remove styles for details.undocumented #91099 (Remove styles for details.undocumented)
Mention std::io::Error::from(ErrorKind) in Error::new() docs #91101 (Mention std::io::Error::from(ErrorKind) in Error::new() docs)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

Create a similar rollup

…er` attribute

The Rust code that generated tags with that class was deleted in 10bafe1.

This conversion is not very discoverable for the cases where an error is required without extra payload.

Unwinding support for inline assembly r? ``@Amanieu``

…plate, r=jsha Move `scripts` on the rustdoc template into `head` and apply the `defer` attribute Closes rust-lang#90719

…umeGomez Remove styles for details.undocumented The Rust code that generated tags with that class was deleted in 10bafe1. r? ``@GuillaumeGomez``

…mulacrum Mention std::io::Error::from(ErrorKind) in Error::new() docs This conversion is not very discoverable for the cases where an error is required without extra payload.

matthiaskrgr · 2021-11-21T23:49:57Z

@bors r+ rollup=never p=4

bors · 2021-11-21T23:49:59Z

📌 Commit 0dc3029 has been approved by matthiaskrgr

bors · 2021-11-22T00:24:45Z

⌛ Testing commit 0dc3029 with merge 7b17b63ca22687d16b39d5c186032c9742f8e46e...

rust-log-analyzer · 2021-11-22T00:48:08Z

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)

test [ui] ui/asm/x86_64/duplicate-options.rs ... ignored
test [ui] ui/asm/x86_64/interpolated-idents.rs ... ignored
test [ui] ui/asm/x86_64/issue-82869.rs ... ignored
test [ui] ui/asm/x86_64/issue-89875.rs ... ignored
test [ui] ui/asm/x86_64/may_unwind.rs ... ignored
test [ui] ui/asm/x86_64/parse-error.rs ... ignored
test [ui] ui/asm/x86_64/srcloc.rs ... ignored
test [ui] ui/asm/x86_64/sym.rs ... ignored
test [ui] ui/asm/x86_64/target-feature-attr.rs ... ignored
---
test [ui] ui/threads-sendsync/mpsc_stress.rs ... ok

failures:

---- [ui] ui/asm/aarch64/may_unwind.rs stdout ----

error: test compilation failed although it shouldn't!
status: exit status: 101
command: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/asm/aarch64/may_unwind.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" "-o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/aarch64/may_unwind/a" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/aarch64/may_unwind/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
thread 'rustc' panicked at 'diverge_from called on block with terminator that cannot unwind.', compiler/rustc_mir_build/src/build/scope.rs:1030:9

error: internal compiler error: unexpected panic

note: the compiler unexpectedly panicked. this is a bug.
note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md

note: rustc 1.58.0-nightly (7b17b63ca 2021-11-22) running on aarch64-unknown-linux-gnu

note: compiler flags: -Z threads=1 -Z ui-testing -Z deduplicate-diagnostics=no -Z emit-future-incompat-report -C codegen-units=1 -C prefer-dynamic -C rpath -C debuginfo=0
query stack during panic:
query stack during panic:
#0 [mir_built] building MIR for `main::{closure#0}`
#1 [unsafety_check_result] unsafety-checking `main::{closure#0}`

------------------------------------------



---- [ui] ui/asm/may_unwind.rs stdout ----

error: test compilation failed although it shouldn't!
Some tests failed in compiletest suite=ui mode=ui host=aarch64-unknown-linux-gnu target=aarch64-unknown-linux-gnu
Some tests failed in compiletest suite=ui mode=ui host=aarch64-unknown-linux-gnu target=aarch64-unknown-linux-gnu
command: "/checkout/obj/build/aarch64-unknown-linux-gnu/stage2/bin/rustc" "/checkout/src/test/ui/asm/may_unwind.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" "-o" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/may_unwind/a" "-Crpath" "-O" "-Cdebuginfo=0" "-Lnative=/checkout/obj/build/aarch64-unknown-linux-gnu/native/rust-test-helpers" "-L" "/checkout/obj/build/aarch64-unknown-linux-gnu/test/ui/asm/may_unwind/auxiliary"
------------------------------------------

------------------------------------------
stderr:
stderr:
------------------------------------------
thread 'rustc' panicked at 'diverge_from called on block with terminator that cannot unwind.', compiler/rustc_mir_build/src/build/scope.rs:1030:9

error: internal compiler error: unexpected panic

note: the compiler unexpectedly panicked. this is a bug.
note: the compiler unexpectedly panicked. this is a bug.

note: we would appreciate a bug report: https://github.com/rust-lang/rust/issues/new?labels=C-bug%2C+I-ICE%2C+T-compiler&template=ice.md

note: rustc 1.58.0-nightly (7b17b63ca 2021-11-22) running on aarch64-unknown-linux-gnu

note: compiler flags: -Z threads=1 -Z ui-testing -Z deduplicate-diagnostics=no -Z emit-future-incompat-report -C codegen-units=1 -C prefer-dynamic -C rpath -C debuginfo=0
query stack during panic:
query stack during panic:
#0 [mir_built] building MIR for `main`
#1 [unsafety_check_result] unsafety-checking `main`

------------------------------------------


---
test result: FAILED. 12245 passed; 2 failed; 151 ignored; 0 measured; 0 filtered out; finished in 152.98s



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:20:41

bors · 2021-11-22T00:49:03Z

💔 Test failed - checks-actions

ken-matsui and others added 17 commits November 20, 2021 21:40

Move scripts on the rustdoc template into head and apply the `def…

88787a3

…er` attribute

Add initial AST and MIR support for unwinding from inline assembly

3e0bfb9

Adjust llvm wrapper for unwinding support for inlineasm

51845be

LLVM codgen support for unwinding inline assembly

14bd87b

cg_cranelift: check may_unwind flag instead of cleanup

162e6a4

Update unstable-book with recent asm changes (may_unwind)

deaade0

rustc_codegen_gcc: error on unwinding inline asm

e5bed51

add unwind_asm feature gate for may_unwind option

060b9d0

add tests for asm's options(may_unwind)

0f637b8

add clobber_abi("C") to may_unwind inline-asm tests

4641af3

rustc_codegen_gcc: proper check for may_unwind

f9cdd5f

Remove styles for details.undocumented

6354b27

The Rust code that generated tags with that class was deleted in 10bafe1.

Mention std::io::Error::from(ErrorKind) in Error::new() docs

289eb78

This conversion is not very discoverable for the cases where an error is required without extra payload.

Rollup merge of rust-lang#88439 - cynecx:unwind_asm, r=Amanieu

ad57b5d

Unwinding support for inline assembly r? ``@Amanieu``

Rollup merge of rust-lang#90872 - ken-matsui:add-defer-to-rustdoc-tem…

1683609

…plate, r=jsha Move `scripts` on the rustdoc template into `head` and apply the `defer` attribute Closes rust-lang#90719

Rollup merge of rust-lang#91099 - jsha:cleanup-undocumented, r=Guilla…

23982ba

…umeGomez Remove styles for details.undocumented The Rust code that generated tags with that class was deleted in 10bafe1. r? ``@GuillaumeGomez``

Rollup merge of rust-lang#91101 - birkenfeld:io_error_docs, r=Mark-Si…

0dc3029

…mulacrum Mention std::io::Error::from(ErrorKind) in Error::new() docs This conversion is not very discoverable for the cases where an error is required without extra payload.

rustbot added the rollup A PR which is a rollup label Nov 21, 2021

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Nov 21, 2021

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 Nov 22, 2021

cynecx mentioned this pull request Nov 22, 2021

Unwinding support for inline assembly #88439

Merged

matthiaskrgr closed this Nov 22, 2021

matthiaskrgr deleted the rollup-hts67rq branch November 25, 2021 19:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 4 pull requests #91117

Rollup of 4 pull requests #91117

matthiaskrgr commented Nov 21, 2021

matthiaskrgr commented Nov 21, 2021

bors commented Nov 21, 2021

bors commented Nov 22, 2021

rust-log-analyzer commented Nov 22, 2021

bors commented Nov 22, 2021

Rollup of 4 pull requests #91117

Rollup of 4 pull requests #91117

Conversation

matthiaskrgr commented Nov 21, 2021

matthiaskrgr commented Nov 21, 2021

bors commented Nov 21, 2021

bors commented Nov 22, 2021

rust-log-analyzer commented Nov 22, 2021

bors commented Nov 22, 2021