Automated pull from upstream `master` #74

github-actions · 2023-10-31T05:14:00Z

This PR pulls the following changes from the upstream repository:

Sync from rust 2023/10/25

…update_cg_gcc_2023-10-25

Rollup of 6 pull requests Successful merges: - #116968 (Invalid `?` suggestion on mismatched `Ok(T)`) - #117032 (Enable cg_clif tests for riscv64gc) - #117106 (When expecting closure argument but finding block provide suggestion) - #117114 (Improve `stringify.rs` test) - #117188 (Avoid repeated interning of `env!("CFG_RELEASE")`) - #117243 (Explain implementation of mem::replace) r? `@ghost` `@rustbot` modify labels: rollup

… fields Fix #22488.

…ect assert Co-authored-by: Jubilee <[email protected]>

Only emit one error per unsized binding, instead of one per usage Fix #56607.

Decompose singular `matches!` with or-patterns to individual `matches!` statements to enable branchless code output. The following functions were changed: - `is_ascii_alphanumeric` - `is_ascii_hexdigit` - `is_ascii_punctuation` Add codegen tests Co-authored-by: George Bateman <[email protected]> Co-authored-by: scottmcm <[email protected]>

Allow target specs to use an LLD flavor, and self-contained linking components This PR allows: - target specs to use an LLD linker-flavor: this is needed to switch `x86_64-unknown-linux-gnu` to using LLD, and is currently not possible because the current flavor json serialization fails to roundtrip on the modern linker-flavors. This can e.g. be seen in rust-lang/rust#115622 (comment) which explains where an `Lld::Yes` is ultimately deserialized into an `Lld::No`. - target specs to declare self-contained linking components: this is needed to switch `x86_64-unknown-linux-gnu` to using `rust-lld` - adds an end-to-end test of a custom target json simulating `x86_64-unknown-linux-gnu` being switched to using `rust-lld` - disables codegen backends from participating because they don't support `-Zgcc-ld=lld` which is the basis of mcp510. r? `@petrochenkov:` if the approach discussed rust-lang/rust#115622 (comment) and on zulip would work for you: basically, see if we can emit only modern linker flavors in the json specs, but accept both old and new flavors while reading them, to fix the roundtrip issue. The backwards compatible `LinkSelfContainedDefault` variants are still serialized and deserialized in `crt-objects-fallback`, while the spec equivalent of e.g. `-Clink-self-contained=+linker` is serialized into a different json object (with future-proofing to incorporate `crt-objects-fallback` in the future). --- I've been test-driving this in rust-lang/rust#113382 to test actually switching `x86_64-unknown-linux-gnu` to `rust-lld` (and fix what needs to be fixed in CI, bootstrap, etc), and it seems to work fine.

ZeroSized constants can be represented as `mir::Const::Val` even if their layout is not yet known. In those cases, CrateItem::body() was crashing when trying to convert a `ConstValue::ZeroSized` into its stable counterpart `ConstantKind::Allocated`. Instead, we now map `ConstValue::ZeroSized` into a new variant: `ConstantKind::ZeroSized`.

Refactor some `char`, `u8` ASCII functions to be branchless Extract conditions in singular `matches!` with or-patterns to individual `matches!` statements which enables branchless code output. The following functions were changed: - `is_ascii_alphanumeric` - `is_ascii_hexdigit` - `is_ascii_punctuation` Added codegen tests --- Continued from rust-lang/rust#103024. Based on the comment from `@scottmcm` rust-lang/rust#103024 (review). The unmodified `is_ascii_*` functions didn't seem to benefit from extracting the conditions. I've never written a codegen test before, but I tried to check that no branches were emitted.

The demangler was only needed by coverage tests, but those tests were migrated into their own custom test mode in #112300. This avoids having to build the demangler just for run-make tests. It will still be built as needed by run-coverage tests or for other purposes.

This avoids useless rebuilds of the demangler when modifying the compiler.

This hopefully fixes the CI run after integration of this target.

…r=dtolnay Stabilize `[const_]pointer_byte_offsets` Closes #96283 Awaiting FCP completion: rust-lang/rust#96283 (comment) r? libs-api

… r=ehuss feat(docs): add cargo-pgo to PGO documentation 📝 fixes #114995

Tweak suggestion span for outer attr and point at item following invalid inner attr After: ``` error: `unix_sigpipe` attribute cannot be used at crate level --> $DIR/unix_sigpipe-crate.rs:2:1 | LL | #![unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ LL | LL | fn main() {} | ------------ the inner attribute doesn't annotate this function | help: perhaps you meant to use an outer attribute | LL - #![unix_sigpipe = "inherit"] LL + #[unix_sigpipe = "inherit"] | ``` Before: ``` error: `unix_sigpipe` attribute cannot be used at crate level --> $DIR/unix_sigpipe-crate.rs:2:1 | LL | #![unix_sigpipe = "inherit"] | ^^^^^^^^^^^^^^^^^^^^^^^^^^^^ | help: perhaps you meant to use an outer attribute | LL | #[unix_sigpipe = "inherit"] | ~~~~~~~~~~~~~~~~~~~~~~~~~~~ ``` CC #89566.

…o-fix-typo, r=the8472 Fix documentation typo in std::iter::Iterator::collect_into

…i-obk Stash and cancel cycle errors for auto trait leakage in opaques We don't need to emit a traditional cycle error when we have a selection error that explains what's going on but in more detail. We may want to augment this error to actually point out the cycle, now that the cycle error is not being emitted. We could do that by storing the set of opaques that was in the `CyclePlaceholder` that gets returned from `type_of_opaque`. r? `@oli-obk` cc `@estebank` #117235

Create a new ConstantKind variant (ZeroSized) for StableMIR ZeroSized constants can be represented as `mir::Const::Val` even if their layout is not yet known. In those cases, CrateItem::body() was crashing when trying to convert a `ConstValue::ZeroSized` into its stable counterpart `ConstantKind::Allocated`. Instead, we now map `ConstValue::ZeroSized` into a new variant: `ConstantKind::ZeroSized`. **Note:** I didn't add any new test here since we already have covering tests in our project repository which I manually confirmed that will fix the issue.

replace transmute by raw pointer cast Now that rust-lang/rust#113257 is fixed we can finally do this. :)

…9, r=compiler-errors Poison check_well_formed if method receivers are invalid to prevent typeck from running on it fixes #117379 Though if some code invokes typeck without having first invoked `check_well_formed` then we'll encounter this ICE again. This can happen in const and const fn bodies if they are evaluated due to other `check_well_formed` checks or similar

…er-errors,Nilstrieb Improve some diagnostics around `?Trait` bounds * uses better spans * clarifies a message that was only talking about generic params, but applies to `dyn ?Trait` and `impl ?Trait` as well

Don't normalize to an un-revealed opaque when we hit the recursion limit Currently, we will normalize `Opaque := Option<&Opaque>` to something like `Option<&Option<&Option<&...Opaque>>>`, hitting a limit and bottoming out in an unnormalized opaque after the recursion limit gets hit. Unfortunately, during `layout_of`, we'll simply recurse and try again if the type normalizes to something different than the type: https://github.com/rust-lang/rust/blob/e6e931dda5fffbae0fd87c5b1af753cc95556880/compiler/rustc_ty_utils/src/layout.rs#L58-L60 That means then we'll try to normalize `Option<&Option<&Option<&...Opaque>>>` again, substituting `Opaque` into itself even deeper. Eventually this will get to the point that we're just stack-overflowing on a really deep type before even hitting an opaque again. To fix this, we just bottom out into `ty::Error` instead of the unrevealed opaque type. Fixes #117412 r? `@oli-obk`

Rollup of 7 pull requests Successful merges: - #116862 (Detect when trait is implemented for type and suggest importing it) - #117389 (Some diagnostics improvements of `gen` blocks) - #117396 (Don't treat closures/coroutine types as part of the public API) - #117398 (Correctly handle nested or-patterns in exhaustiveness) - #117403 (Poison check_well_formed if method receivers are invalid to prevent typeck from running on it) - #117411 (Improve some diagnostics around `?Trait` bounds) - #117414 (Don't normalize to an un-revealed opaque when we hit the recursion limit) r? `@ghost` `@rustbot` modify labels: rollup

When an associated type with GATs isn't specified in a `dyn Trait`, emit an object safety error instead of only complaining about the missing associated type, as it will lead the user down a path of three different errors before letting them know that what they were trying to do is impossible to begin with. Fix #103155.

Detect object safety errors when assoc type is missing When an associated type with GATs isn't specified in a `dyn Trait`, emit an object safety error instead of only complaining about the missing associated type, as it will lead the user down a path of three different errors before letting them know that what they were trying to do is impossible to begin with. Fix #103155.

…iasko Enable cross-crate-inlining when MIR inlining is enabled This would make rust-lang/rust#117355 generally less obscure, and also seems like a good idea, even if for some reason someone wants MIR opts but no codegen opts.

This commit is generated by `ferrocene/tools/pull-upstream/pull.sh`. The list of excluded files is defined in `.gitattributes`.

See 8fa800d

See 5c1872d

See dc3d428

$ ./x run generate-completions Would have saved time by avoiding doing 9692b7e manually

tshepang

bors merge

bors-ferrocene · 2023-10-31T19:07:17Z

Build failed:

full

Should of been part of a39884b

tshepang

bors merge

bors-ferrocene · 2023-10-31T21:51:19Z

Build succeeded:

full

antoyo and others added 30 commits October 26, 2023 17:40

Merge pull request #371 from rust-lang/sync_from_rust_2023_10_25

e4fe941

Sync from rust 2023/10/25

Merge commit 'e4fe941b11a55c5005630696e9b6d81c65f7bd04' into subtree-…

c797ccc

…update_cg_gcc_2023-10-25

Suggest assoc fn new when trying to build tuple struct with private…

87dc85d

… fields Fix #22488.

Documentation and error message improvements related to PassMode::Dir…

4d33876

…ect assert Co-authored-by: Jubilee <[email protected]>

Recover ternary expression as error

e81a5c6

Auto merge of #113183 - estebank:redundant-sized-errors, r=davidtwco

aa91057

Only emit one error per unsized binding, instead of one per usage Fix #56607.

Parse rustc version at compile time

b7debe3

Declare rustc_target dependency on object/macho

0a82920

Abstract over per-column pattern traversal

beecd93

Lint overlapping ranges as a separate pass

d5070e3

Handle ty::Opaque correctly

3fa2e71

replace transmute by raw pointer cast

b3f7f4d

For run-coverage tests, build rust-demangler with the stage 0 compiler

36c3f90

This avoids useless rebuilds of the demangler when modifying the compiler.

i586_unknown_netbsd.rs: fix formatting.

893e726

This hopefully fixes the CI run after integration of this target.

Auto merge of #116205 - WaffleLapkin:stabilize_pointer_byte_offsets, …

54e57e6

…r=dtolnay Stabilize `[const_]pointer_byte_offsets` Closes #96283 Awaiting FCP completion: rust-lang/rust#96283 (comment) r? libs-api

Hide internal methods from documentation

72d5f4b

For i586/NetBSD: fix another formatting insistence.

0f04e2d

Link to correct issue in PassMode::Direct ptx-kernel exception

bb45c81

Rollup merge of #114998 - meysam81:meysam/feat/add-cargo-pgo-to-docs,…

8d67c32

… r=ehuss feat(docs): add cargo-pgo to PGO documentation 📝 fixes #114995

Rollup merge of #117240 - trueNAHO:docs-std-iter-Iterator-collect-int…

203292e

…o-fix-typo, r=the8472 Fix documentation typo in std::iter::Iterator::collect_into

Rollup merge of #117266 - RalfJung:cast-not-transmute, r=thomcc

2fdac63

replace transmute by raw pointer cast Now that rust-lang/rust#113257 is fixed we can finally do this. :)

matthiaskrgr and others added 11 commits October 30, 2023 21:03

Rollup merge of #117411 - oli-obk:query_merge_immobile_game, r=compil…

3e95c6a

…er-errors,Nilstrieb Improve some diagnostics around `?Trait` bounds * uses better spans * clarifies a message that was only talking about generic params, but applies to `dyn ?Trait` and `impl ?Trait` as well

Add test

8c55772

Sort errors

b8a8ba9

remove excluded files from upstream

2a97b14

This commit is generated by `ferrocene/tools/pull-upstream/pull.sh`. The list of excluded files is defined in `.gitattributes`.

pull new changes from upstream

5280890

github-actions bot added automation Issue or PR created by an automation backport:never PR that should never be backported labels Oct 31, 2023

tshepang added 8 commits October 31, 2023 17:23

fix upstream-pull conflicts

9692b7e

"x test tests/mir-opt --bless"

d896e90

annotated test moved

1af48ab

See 8fa800d

annotated test moved

d9c5176

See 5c1872d

fix upstream-pull conflict

a39884b

fix upstream pull conflict

2cc629e

annotated test removed

dc5e876

See dc3d428

these are actually auto-generated

76733dd

$ ./x run generate-completions Would have saved time by avoiding doing 9692b7e manually

tshepang approved these changes Oct 31, 2023

View reviewed changes

bless output of a newly-annotated test

31d5f2a

Should of been part of a39884b

tshepang approved these changes Oct 31, 2023

View reviewed changes

bors-ferrocene bot merged commit e4e629c into main Oct 31, 2023

bors-ferrocene bot deleted the automation/pull-upstream/977kcgdr branch October 31, 2023 21:51

pietroalbini added the merged-in:1.75 label Jan 16, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Automated pull from upstream `master` #74

Automated pull from upstream `master` #74

Uh oh!

github-actions bot commented Oct 31, 2023

Uh oh!

tshepang left a comment

Uh oh!

bors-ferrocene bot commented Oct 31, 2023

Uh oh!

tshepang left a comment

Uh oh!

bors-ferrocene bot commented Oct 31, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

42 participants

Automated pull from upstream master #74

Automated pull from upstream master #74

Uh oh!

Conversation

github-actions bot commented Oct 31, 2023

Uh oh!

tshepang left a comment

Choose a reason for hiding this comment

Uh oh!

bors-ferrocene bot commented Oct 31, 2023

Uh oh!

tshepang left a comment

Choose a reason for hiding this comment

Uh oh!

bors-ferrocene bot commented Oct 31, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

42 participants

Automated pull from upstream `master` #74

Automated pull from upstream `master` #74