Rollup of 7 pull requests #94807

Dylan-DPC · 2022-03-10T15:01:29Z

Successful merges:

Make llvm-libunwind a per-target option #93604 (Use in-tree libunwind by default on Fuchsia)
[1/2] Implement macro meta-variable expressions #94368 ([1/2] Implement macro meta-variable expressions)
Better error for normalization errors from parent crates that use #![feature(generic_const_exprs)] #94440 (Better error for normalization errors from parent crates that use #![feature(generic_const_exprs)])
Document new recommended use of FromIterator::from_iter #94587 (Document new recommended use of FromIterator::from_iter)
Fix soundness issue in scoped threads. #94644 (Fix soundness issue in scoped threads.)
Statically compile libstdc++ everywhere if asked #94719 (Statically compile libstdc++ everywhere if asked)
Only emit pointer-like metadata for Box<T, A> when A is ZST #94728 (Only emit pointer-like metadata for Box<T, A> when A is ZST)

Failed merges:

r? @ghost
@rustbot modify labels: rollup

PR rust-lang#93918 made it so that `-static-libstdc++` was only set in one place, and was only set during linking, but accidentally also made it so that it is no longer passed when building LLD or sanitizers, only when building LLVM itself. This moves the logic for setting `-static-libstdc++` in the linker flags back to `configure_cmake` so that it takes effect for all CMake invocations in `native.rs`. As a side-effect, this also causes libstdc++ to be statically compiled into sanitizers and LLD if `llvm-tools-enabled` is set but `llvm-static-stdcpp` is not, even though previously it was only linked statically if `llvm-static-stdcpp` was set explicitly. But that seems more like the expected behavior anyway.

…r=Mark-Simulacrum Use in-tree libunwind by default on Fuchsia Fuchsia doesn't ship libunwind in its SDK, so we must provide it statically.

…aaaa, r=petrochenkov [1/2] Implement macro meta-variable expressions See rust-lang#93545 (comment) The logic behind `length`, `index` and `count` was removed but the parsing code is still present, i.e., everything is simply ignored like `ignored`. r? `@petrochenkov`

Better error for normalization errors from parent crates that use `#![feature(generic_const_exprs)]` This PR implements a somewhat rudimentary heuristic to suggest using `#![feature(generic_const_exprs)]` in a child crate when a function from a foreign crate (that may have used `#![feature(generic_const_exprs)]`) fails to normalize during codegen. cc: rust-lang#79018 cc: rust-lang#94287

…ottmcm Document new recommended use of `FromIterator::from_iter` rust-lang#90107 Most of the added prose was paraphrased from the links provided in the issue. The suggested `VecDeque` example seemed to make the point well enough so I just used that.

…ss, r=joshtriplett Fix soundness issue in scoped threads. This was discovered in rust-lang#94559 (comment) The `scope()` function returns when all threads are finished, but I accidentally considered a thread 'finished' before dropping their panic payload or ignored return value. So if a thread returned (or panics with) something that in its `Drop` implementation still uses borrowed stuff, it goes wrong. https://play.rust-lang.org/?version=nightly&mode=debug&edition=2021&gist=2a1f19ac4676cdabe43e24e536ff9358

…mulacrum Statically compile libstdc++ everywhere if asked PR rust-lang#93918 made it so that `-static-libstdc++` was only set in one place, and was only set during linking, but accidentally also made it so that it is no longer passed when building LLD, only when building LLVM itself. This moves the logic for setting `-static-libstdc++` in the linker flags to `configure_cmake` so that it takes effect for all CMake invocations in `native.rs`. As a side-effect, this also causes libstdc++ to be statically compiled into sanitizers, whereas previously the `llvm-static-stdcpp` flag had no effect on sanitizers. It also makes it so that LLD will be compiled statically if `llvm-tools-enabled` is set, even though previously it was only linked statically if `llvm-static-stdcpp` was set explicitly. Both of these seem like they match expected behavior than what was there prior to rust-lang#93918.

…eta, r=michaelwoerister Only emit pointer-like metadata for `Box<T, A>` when `A` is ZST Basically copy the change in rust-lang#94043, but for debuginfo. r? `@michaelwoerister` Fixes rust-lang#94725

Dylan-DPC · 2022-03-10T15:01:41Z

@bors r+ rollup=never p=5

bors · 2022-03-10T15:01:43Z

📌 Commit a17d8a0 has been approved by Dylan-DPC

bors · 2022-03-10T17:23:21Z

⌛ Testing commit a17d8a0 with merge 24d81d6287a79a7c3c1dd58488ce68a9c3ba7796...

rust-log-analyzer · 2022-03-10T17:36:27Z

The job dist-various-2 failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

running: "x86_64-fuchsia-clang++" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-fuchsia" "-I" "/checkout/src/llvm-project/libunwind/include" "-nostdinc++" "-fno-exceptions" "-fno-rtti" "-fstrict-aliasing" "-funwind-tables" "-fvisibility=hidden" "-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS" "-o" "/checkout/obj/build/x86_64-fuchsia/native/libunwind/Unwind-EHABI.o" "-c" "/checkout/src/llvm-project/libunwind/src/Unwind-EHABI.cpp"
exit status: 0
running: "x86_64-fuchsia-clang++" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-fuchsia" "-I" "/checkout/src/llvm-project/libunwind/include" "-nostdinc++" "-fno-exceptions" "-fno-rtti" "-fstrict-aliasing" "-funwind-tables" "-fvisibility=hidden" "-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS" "-o" "/checkout/obj/build/x86_64-fuchsia/native/libunwind/Unwind-seh.o" "-c" "/checkout/src/llvm-project/libunwind/src/Unwind-seh.cpp"
exit status: 0
running: "x86_64-fuchsia-clang++" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-fuchsia" "-I" "/checkout/src/llvm-project/libunwind/include" "-nostdinc++" "-fno-exceptions" "-fno-rtti" "-fstrict-aliasing" "-funwind-tables" "-fvisibility=hidden" "-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS" "-o" "/checkout/obj/build/x86_64-fuchsia/native/libunwind/libunwind.o" "-c" "/checkout/src/llvm-project/libunwind/src/libunwind.cpp"
cargo:warning=In file included from /checkout/src/llvm-project/libunwind/src/libunwind.cpp:30:
cargo:warning=In file included from /checkout/src/llvm-project/libunwind/src/AddressSpace.hpp:23:
cargo:warning=In file included from /checkout/src/llvm-project/libunwind/src/EHHeaderParser.hpp:17:
cargo:warning=In file included from /checkout/src/llvm-project/libunwind/src/DwarfParser.hpp:22:
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:116:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_x86, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:342:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_x86_64, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:670:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_ppc, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:674:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert(sizeof(ppc_thread_state_t) == 160,
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:679:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert(sizeof(ppc_thread_state_t) + sizeof(ppc_float_state_t) == 424,
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:1237:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_ppc64, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:1241:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert(sizeof(_registers) == 312,
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:1246:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert(sizeof(_registers) +
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:1845:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_arm64, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:1848:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert(sizeof(GPRs) == 0x110,
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:2198:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_arm, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:2625:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_or1k, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:2831:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_mips_o32, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3153:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_mips_newabi, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3442:3: error: use of undeclared identifier 'static_assert'; did you mean 'static_cast'?
cargo:warning=  static_assert((check_fit<Registers_sparc, unw_context_t>::does_fit),
cargo:warning=  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3595:25: warning: defaulted function definitions are a C++11 extension [-Wc++11-extensions]
cargo:warning=  Registers_sparc64() = default;
cargo:warning=                        ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3625:26: error: function definition does not declare parameters
cargo:warning=  sparc64_thread_state_t _registers{};
cargo:warning=                         ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3626:21: warning: in-class initialization of non-static data member is a C++11 extension [-Wc++11-extensions]
cargo:warning=  uint64_t _wcookie = 0;
cargo:warning=                    ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3614:35: error: use of undeclared identifier '_registers'
cargo:warning=  uint64_t getSP() const { return _registers.__regs[UNW_SPARC_O6] + 2047; }
cargo:warning=                                  ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3615:32: error: use of undeclared identifier '_registers'
cargo:warning=  void setSP(uint64_t value) { _registers.__regs[UNW_SPARC_O6] = value - 2047; }
cargo:warning=                               ^
cargo:warning=/checkout/src/llvm-project/libunwind/src/Registers.hpp:3616:35: error: use of undeclared identifier '_registers'
cargo:warning=  uint64_t getIP() const { return _registers.__regs[UNW_SPARC_O7]; }
cargo:warning=                                  ^
cargo:warning=fatal error: too many errors emitted, stopping now [-ferror-limit=]
cargo:warning=2 warnings and 20 errors generated.
exit status: 1


error occurred: Command "x86_64-fuchsia-clang++" "-O3" "-ffunction-sections" "-fdata-sections" "-fPIC" "--target=x86_64-fuchsia" "-I" "/checkout/src/llvm-project/libunwind/include" "-nostdinc++" "-fno-exceptions" "-fno-rtti" "-fstrict-aliasing" "-funwind-tables" "-fvisibility=hidden" "-D_LIBUNWIND_DISABLE_VISIBILITY_ANNOTATIONS" "-o" "/checkout/obj/build/x86_64-fuchsia/native/libunwind/libunwind.o" "-c" "/checkout/src/llvm-project/libunwind/src/libunwind.cpp" with args "x86_64-fuchsia-clang++" did not execute successfully (status code exit status: 1).

Build completed unsuccessfully in 0:09:25

bors · 2022-03-10T17:37:30Z

💔 Test failed - checks-actions

Jeff and others added 20 commits March 3, 2022 19:45

Document new recommended use of method

c956fe5

Make use statement visible

5f34c04

Add suggested changes to the docs

b363f13

only emit pointer-like metadata for BZST-allocator Box

307ee94

Fix soundness issue in scoped threads.

5226395

Properly abort when thread result panics on drop.

7a481ff

Remove outdated comment.

1c06eb7

Add soundness test for dropping scoped thread results before joining.

b97d875

Implement macro meta-variable expressions

8073a88

suggest enabling generic_const_exprs feature if const is unevaluatable

109cdc7

Make llvm-libunwind a per-target option

9d857d9

Use in-tree libunwind by default on Fuchsia

42624ba

Rollup merge of rust-lang#93604 - tmandry:libunwind-fuchsia-default, …

005d3b7

…r=Mark-Simulacrum Use in-tree libunwind by default on Fuchsia Fuchsia doesn't ship libunwind in its SDK, so we must provide it statically.

Rollup merge of rust-lang#94728 - compiler-errors:box-allocator-zst-m…

a17d8a0

…eta, r=michaelwoerister Only emit pointer-like metadata for `Box<T, A>` when `A` is ZST Basically copy the change in rust-lang#94043, but for debuginfo. r? `@michaelwoerister` Fixes rust-lang#94725

rustbot added T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. rollup A PR which is a rollup labels Mar 10, 2022

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 10, 2022

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Mar 10, 2022

bors added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 10, 2022

Dylan-DPC mentioned this pull request Mar 10, 2022

Make llvm-libunwind a per-target option #93604

Merged

Dylan-DPC closed this Mar 10, 2022

Dylan-DPC deleted the rollup-md5jg31 branch March 10, 2022 18:53

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 7 pull requests #94807

Rollup of 7 pull requests #94807

Dylan-DPC commented Mar 10, 2022

Dylan-DPC commented Mar 10, 2022

bors commented Mar 10, 2022

bors commented Mar 10, 2022

rust-log-analyzer commented Mar 10, 2022

bors commented Mar 10, 2022

Rollup of 7 pull requests #94807

Rollup of 7 pull requests #94807

Conversation

Dylan-DPC commented Mar 10, 2022

Dylan-DPC commented Mar 10, 2022

bors commented Mar 10, 2022

bors commented Mar 10, 2022

rust-log-analyzer commented Mar 10, 2022

bors commented Mar 10, 2022