Rollup of 10 pull requests #135893

matthiaskrgr · 2025-01-22T18:29:46Z

Successful merges:

Refactor dyn-compatibility error and suggestions #133372 (Refactor dyn-compatibility error and suggestions)
AIX: use align 8 for byval parameter #134396 (AIX: use align 8 for byval parameter)
Make our DIFlags match LLVMDIFlags in the LLVM-C API #135156 (Make our DIFlags match LLVMDIFlags in the LLVM-C API)
Use structurally_normalize instead of manual normalizes-to goals in alias relate errors #135816 (Use structurally_normalize instead of manual normalizes-to goals in alias relate errors)
make UI tests that use --test work on panic=abort targets #135823 (make UI tests that use --test work on panic=abort targets)
Update the wasm-component-ld tool #135850 (Update the wasm-component-ld tool)
rustdoc: Finalize dyn compatibility renaming #135858 (rustdoc: Finalize dyn compatibility renaming)
Don't pick T: FnPtr nested goals as the leaf goal in diagnostics for new solver #135866 (Don't pick T: FnPtr nested goals as the leaf goal in diagnostics for new solver)
Enforce that all spans are lowered in ast lowering #135874 (Enforce that all spans are lowered in ast lowering)
Remove Copy bound from enter_forall #135875 (Remove Copy bound from enter_forall)

r? @ghost
@rustbot modify labels: rollup

by adding `-Zpanic_abort_test`, which is a no-op on panic=unwind targets fixes rust-lang#135819

This commit updates the `wasm-component-ld` tool from 0.5.11 to 0.5.12. This pulls in a fix for the binary adapters that are included with this tool for an issue described in bytecodealliance/wasmtime#10058. Some other dependencies have additionally been updated in the meantime of `wasm-component-ld` but there should otherwise be no major changes.

This CL makes a number of small changes to dyn compatibility errors: - "object safety" has been renamed to "dyn-compatibility" throughout - "Convert to enum" suggestions are no longer generated when there exists a type-generic impl of the trait or an impl for `dyn OtherTrait` - Several error messages are reorganized for user readability Additionally, the dyn compatibility error creation code has been split out into functions. cc rust-lang#132713 cc rust-lang#133267

…=fmease Refactor dyn-compatibility error and suggestions This CL makes a number of small changes to dyn compatibility errors: - "object safety" has been renamed to "dyn-compatibility" throughout - "Convert to enum" suggestions are no longer generated when there exists a type-generic impl of the trait or an impl for `dyn OtherTrait` - Several error messages are reorganized for user readability Additionally, the dyn compatibility error creation code has been split out into functions. cc rust-lang#132713 cc rust-lang#133267 r? `@compiler-errors`

…gnment, r=wesleywiser AIX: use align 8 for byval parameter On AIX, byval pointer arguments are aligned to 8 bytes based on the 64bit register size. For example, the C callee https://godbolt.org/z/5f4vnG6bh will expect the following argument. ``` ptr nocapture noundef readonly byval(%struct.TwoU64s) align 8 %0 ``` This case is captured by `run-make/extern-fn-explicit-align`

Make our `DIFlags` match `LLVMDIFlags` in the LLVM-C API In order to be able to use a mixture of LLVM-C and C++ bindings for debuginfo, our Rust-side `DIFlags` needs to have the same layout as LLVM-C's `LLVMDIFlags`, and we also need to be able to convert it to the `DIFlags` accepted by LLVM's C++ API. Internally, LLVM converts between the two types with a simple cast. We can't necessarily rely on that always being true, and LLVM doesn't expose a conversion function, so we have two potential options: - Convert each bit/subvalue individually - Statically assert that doing a cast is actually fine As long as both types do remain the same under the hood (which seems likely), the static-assert-and-cast approach is easier and faster. If the static assertions ever start failing against some future version of LLVM, we'll have to switch over to the convert-each-subvalue approach, which is a bit more error-prone. --- Extracted from rust-lang#134009, though this PR ended up choosing the static-assert-and-cast approach over the convert-each-subvalue approach.

…e, r=lcnr Use `structurally_normalize` instead of manual `normalizes-to` goals in alias relate errors r? `@lcnr` I added `structurally_normalize_term` so that code that is generic over ty or const can use the structurally normalize helpers. See `tests/ui/traits/next-solver/diagnostics/alias_relate_error_uses_structurally_normalize.rs` for a description of the reason for the (now fixed) ICEs

make UI tests that use `--test` work on panic=abort targets By passing `-Zpanic_abort_test`. fixes rust-lang#135819

…-ld, r=jieyouxu Update the `wasm-component-ld` tool This commit updates the `wasm-component-ld` tool from 0.5.11 to 0.5.12. This pulls in a fix for the binary adapters that are included with this tool for an issue described in bytecodealliance/wasmtime#10058. Some other dependencies have additionally been updated in the meantime of `wasm-component-ld` but there should otherwise be no major changes.

…pat-ii, r=GuillaumeGomez rustdoc: Finalize dyn compatibility renaming Update the Reference link to use the new URL fragment from rust-lang/reference#1666 (this change has finally hit stable). Fixes a FIXME. Follow-up to rust-lang#131594. Part of rust-lang#130852.

…ls, r=lcnr Don't pick `T: FnPtr` nested goals as the leaf goal in diagnostics for new solver r? `@lcnr` See `tests/ui/traits/next-solver/diagnostics/dont-pick-fnptr-bound-as-leaf.rs` for a minimized example of what code this affects the diagnostics off. The output of running nightly `-Znext-solver` on that test is the following: ``` error[E0277]: the trait bound `Foo: Trait` is not satisfied --> src/lib.rs:14:20 | 14 | requires_trait(Foo); | -------------- ^^^ the trait `FnPtr` is not implemented for `Foo` | | | required by a bound introduced by this call | note: required for `Foo` to implement `Trait` --> src/lib.rs:7:16 | 7 | impl<T: FnPtr> Trait for T {} | ----- ^^^^^ ^ | | | unsatisfied trait bound introduced here note: required by a bound in `requires_trait` --> src/lib.rs:11:22 | 11 | fn requires_trait<T: Trait>(_: T) {} | ^^^^^ required by this bound in `requires_trait` ``` Part of rust-lang/trait-system-refactor-initiative#148

…ler-errors Enforce that all spans are lowered in ast lowering This should ensure that incremental is used as extensively as possible. It's only a debug assertion, and only enabled when incremental is enabled (as we only lower spans to relative spans then).

Remove `Copy` bound from `enter_forall` idk why we ever required this, `TypeFoldable` implies `Clone`

rustbot · 2025-01-22T18:29:51Z

Could not assign reviewer from: ghost.
User(s) ghost are either the PR author, already assigned, or on vacation. Please use r? to specify someone else to assign.

matthiaskrgr · 2025-01-22T18:31:02Z

@bors r+ rollup=never p=10

bors · 2025-01-22T18:31:05Z

📌 Commit e0b4ba3 has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2025-01-22T19:33:24Z

⌛ Testing commit e0b4ba3 with merge 649b995...

bors · 2025-01-22T22:17:58Z

☀️ Test successful - checks-actions
Approved by: matthiaskrgr
Pushing 649b995 to master...

rust-timer · 2025-01-22T23:36:36Z

Finished benchmarking commit (649b995): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is the most reliable metric that we have; it was used to determine the overall result at the top of this comment. However, even this metric can sometimes exhibit noise.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-0.3%	[-0.3%, -0.3%]	1
All ❌✅ (primary)	-	-	0

Max RSS (memory usage)

Results (secondary 2.7%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	2.7%	[2.7%, 2.7%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Cycles

Results (primary -2.4%)

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-2.4%	[-2.4%, -2.4%]	1
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-2.4%	[-2.4%, -2.4%]	1

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 762.981s -> 775.25s (1.61%)
Artifact size: 325.94 MiB -> 325.93 MiB (-0.00%)

mustartt and others added 22 commits December 17, 2024 18:36

byval parameter should have align 8 on aix

7bfcddf

Make our DIFlags match LLVMDIFlags in the LLVM-C API

32f1c1d

Note that cg_llvm's gimli should match the version used elsewhere

d10bdaf

make UI tests that use --test work on panic=abort targets

ece8b0c

by adding `-Zpanic_abort_test`, which is a no-op on panic=unwind targets fixes rust-lang#135819

rustdoc: Finalize dyn compatibility renaming

ff7cf14

Don't pick T: FnPtr nested goals

3ef506f

Use structurally_normalize instead of manual normalizes-to goals

513bfaa

Rename structurally_normalize to structurally_normalize_ty

b99f59b

Enforce that all spans are lowered in ast lowering

20ae3c0

Remove Copy bound from enter_forall

921c226

Rollup merge of rust-lang#135823 - ferrocene:ja-gh135819, r=jieyouxu

e4c144b

make UI tests that use `--test` work on panic=abort targets By passing `-Zpanic_abort_test`. fixes rust-lang#135819

Rollup merge of rust-lang#135875 - BoxyUwU:enter_forall_no_copy, r=lcnr

e0b4ba3

Remove `Copy` bound from `enter_forall` idk why we ever required this, `TypeFoldable` implies `Clone`

rustbot assigned SparrowLii Jan 22, 2025

matthiaskrgr unassigned SparrowLii Jan 22, 2025

bors added the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Jan 22, 2025

bors added the merged-by-bors This PR was explicitly merged by bors. label Jan 22, 2025

bors merged commit 649b995 into rust-lang:master Jan 22, 2025
7 checks passed

rustbot added this to the 1.86.0 milestone Jan 22, 2025

This was referenced Jan 22, 2025

Compiler: Finalize dyn compatibility renaming #135860

Merged

Manually walk into WF obligations in BestObligation proof tree visitor #135900

Merged

matthiaskrgr deleted the rollup-2qqo647 branch January 25, 2025 09:13

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Rollup of 10 pull requests #135893

Rollup of 10 pull requests #135893

Uh oh!

matthiaskrgr commented Jan 22, 2025

Uh oh!

rustbot commented Jan 22, 2025

Uh oh!

matthiaskrgr commented Jan 22, 2025

Uh oh!

bors commented Jan 22, 2025

Uh oh!

bors commented Jan 22, 2025

Uh oh!

bors commented Jan 22, 2025

Uh oh!

Uh oh!

rust-timer commented Jan 22, 2025

Uh oh!

Uh oh!

Rollup of 10 pull requests #135893

Rollup of 10 pull requests #135893

Uh oh!

Conversation

matthiaskrgr commented Jan 22, 2025

Uh oh!

rustbot commented Jan 22, 2025

Uh oh!

matthiaskrgr commented Jan 22, 2025

Uh oh!

bors commented Jan 22, 2025

Uh oh!

bors commented Jan 22, 2025

Uh oh!

bors commented Jan 22, 2025

Uh oh!

Uh oh!

rust-timer commented Jan 22, 2025

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Uh oh!