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.

Sign up for GitHub

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

Jump to bottom

Stop SRoA'ing `DynMetadata` in MIR #125508

Merged

bors merged 1 commit into rust-lang:master from scottmcm:fix-125506

May 26, 2024

Member

scottmcm commented May 24, 2024

rustbot assigned estebank

Collaborator

rustbot commented May 24, 2024

rustbot has assigned @estebank.
They will have a look at your PR within the next two weeks and either review your PR or reassign to another reviewer.

Use r? to explicitly pick a reviewer

rustbot added S-waiting-on-review T-compiler labels

Collaborator

rustbot commented May 24, 2024

Some changes occurred to MIR optimizations

cc @rust-lang/wg-mir-opt

Member

matthiaskrgr commented May 24, 2024

test? :3

Noratrieb reviewed

View reviewed changes

compiler/rustc_mir_transform/src/sroa.rs

@@ @@ -70,6 +70,11 @@ fn escaping_locals<'tcx>( @@
                               // Exclude #[repr(simd)] types so that they are not de-optimized into an array
                               return true;
                           }
+                          if Some(def.did()) == tcx.lang_items().dyn_metadata() {
+                              // codegen wants to see the `DynMetadata<T>`,

Member

Noratrieb May 24, 2024

i actually think it's about time to investigate remove the layout special casing from dynmetadata and seeing what happens if you just let it be repr(transparent) :3

Member Author

scottmcm May 25, 2024 •

edited

Loading

Tried it out; #125532 (comment)

Looks like the hardest part might be dealing with whether the reference actually has AM memory behind it, and I have no idea how to solve that, so I'll stick with this change for now.

scottmcm mentioned this pull request

What if DynMetadata wasn't special? #125532

Closed

scottmcm force-pushed the fix-125506 branch from 1caff8e to ceb5de3 Compare

May 25, 2024 07:18

This comment has been minimized.

Sign in to view


          Stop SRoA'ing DynMetadata in MIR

d7248d7

scottmcm force-pushed the fix-125506 branch from ceb5de3 to d7248d7 Compare

May 25, 2024 07:45

Member

Noratrieb commented May 25, 2024

Contributor

bors commented May 25, 2024

📌 Commit d7248d7 has been approved by Nilstrieb

It is now in the queue for this repository.

bors added S-waiting-on-bors and removed S-waiting-on-review labels

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

f9d3571

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

matthiaskrgr mentioned this pull request

Rollup of 8 pull requests #125557

Closed

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125557 - matthiaskrgr:rollup-r58xtkc, r=matth…

0e9a615

…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125413 (drop region constraints for ambiguous goals)
 - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)
 - rust-lang#125546 (Try to not reinstall tools in mingw CI)

r? `@ghost`
`@rustbot` modify labels: rollup

fmease added a commit to fmease/rust that referenced this pull request


          Rollup merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

54c18c3

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

fmease mentioned this pull request

Rollup of 8 pull requests #125563

Closed

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125563 - fmease:rollup-ioszhmm, r=fmease

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125070 (Panic if `PathBuf::set_extension` would add a path separator)
 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125413 (drop region constraints for ambiguous goals)
 - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)

r? `@ghost`
`@rustbot` modify labels: rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125563 - fmease:rollup-ioszhmm, r=fmease

7052f31

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125070 (Panic if `PathBuf::set_extension` would add a path separator)
 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125413 (drop region constraints for ambiguous goals)
 - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)

r? `@ghost`
`@rustbot` modify labels: rollup

jhpratt added a commit to jhpratt/rust that referenced this pull request


          Rollup merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

efa5760

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

jhpratt mentioned this pull request

Rollup of 7 pull requests #125565

Closed

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125565 - jhpratt:rollup-vddsp1p, r=jhpratt

e8e911a

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)
 - rust-lang#125546 (Try to not reinstall tools in mingw CI)

r? `@ghost`
`@rustbot` modify labels: rollup

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

aeb6171

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

matthiaskrgr mentioned this pull request

Rollup of 8 pull requests #125567

Closed

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125567 - matthiaskrgr:rollup-ca5ptd7, r=matth…

c91ad1c

…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125413 (drop region constraints for ambiguous goals)
 - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)
 - rust-lang#125559 (Simplify the `unchecked_sh[lr]` ub-checks a bit)

r? `@ghost`
`@rustbot` modify labels: rollup

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

376001d

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

matthiaskrgr mentioned this pull request

Rollup of 7 pull requests #125568

Closed

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125568 - matthiaskrgr:rollup-uxh43ud, r=matth…

f2bb570

…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125433 (A small diagnostic improvement for dropping_copy_types)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)
 - rust-lang#125559 (Simplify the `unchecked_sh[lr]` ub-checks a bit)

r? `@ghost`
`@rustbot` modify labels: rollup

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request


          Rollup merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

aba81b5

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

matthiaskrgr mentioned this pull request

Rollup of 7 pull requests #125569

Closed

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125569 - matthiaskrgr:rollup-8f32rfs, r=matth…

4e3fa17

…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125473 (fix(opt-dist): respect existing config.toml)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125530 (cleanup dependence of `ExtCtxt` in transcribe when macro expansion)
 - rust-lang#125544 (Also mention my-self for other check-cfg docs changes)
 - rust-lang#125559 (Simplify the `unchecked_sh[lr]` ub-checks a bit)

r? `@ghost`
`@rustbot` modify labels: rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

8768a6a

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

Contributor

bors commented May 26, 2024

⌛ Testing commit d7248d7 with merge 8768a6a...

Contributor

bors commented May 26, 2024

💔 Test failed - checks-actions

bors added S-waiting-on-review and removed S-waiting-on-bors labels

Collaborator

rust-log-analyzer commented May 26, 2024

A job failed! Check out the build log: (web) (plain)

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

Total Installed Size:  166.93 MiB

:: Proceed with installation? [Y/n] 
:: Retrieving packages...
error: failed retrieving file 'mingw-w64-i686-openssl-3.2.0-1-any.pkg.tar.zst.sig' from mirror.umd.edu : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
 mingw-w64-i686-cmake-3.28.1-1-any downloading...
error: failed retrieving file 'mingw-w64-i686-curl-8.5.0-1-any.pkg.tar.zst.sig' from mirror.umd.edu : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
error: failed retrieving file 'mingw-w64-i686-gettext-0.22.4-3-any.pkg.tar.zst' from mirror.msys2.org : Operation too slow. Less than 1 bytes/sec transferred the last 10 seconds
warning: failed to retrieve some files
error: failed to commit transaction (unexpected error)
 mingw-w64-i686-openssl-3.2.0-1-any downloading...

Member

Noratrieb commented May 26, 2024

skill issue
@bors retry

bors added S-waiting-on-bors and removed S-waiting-on-review labels

matthiaskrgr mentioned this pull request

Rollup of 6 pull requests #125574

Merged

bors added a commit to rust-lang-ci/rust that referenced this pull request


          Auto merge of rust-lang#125574 - matthiaskrgr:rollup-1oljoup, r=matth…

785eb65

…iaskrgr

Rollup of 6 pull requests

Successful merges:

 - rust-lang#125307 (tidy: stop special-casing tests/ui entry limit)
 - rust-lang#125375 (Create a triagebot ping group for Rust for Linux)
 - rust-lang#125473 (fix(opt-dist): respect existing config.toml)
 - rust-lang#125508 (Stop SRoA'ing `DynMetadata` in MIR)
 - rust-lang#125561 (Stabilize `slice_flatten`)
 - rust-lang#125571 (f32: use constants instead of reassigning a dummy value as PI)

r? `@ghost`
`@rustbot` modify labels: rollup

bors merged commit 5fef6c5 into rust-lang:master

6 of 7 checks passed

rustbot added this to the 1.80.0 milestone

rust-timer added a commit to rust-lang-ci/rust that referenced this pull request


          Unrolled build for rust-lang#125508

Rollup merge of rust-lang#125508 - scottmcm:fix-125506, r=Nilstrieb

Stop SRoA'ing `DynMetadata` in MIR

Fixes rust-lang#125506

scottmcm deleted the fix-125506 branch

May 26, 2024 19:46

This was referenced May 27, 2024

Add an intrinsic for ptr::metadata #124251

Merged

Enable GVN for AggregateKind::RawPtr #125041

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

S-waiting-on-bors T-compiler