Sync from rust 56ee85274e5a3a4dda92f3bf73d1664c74ff9c15

diff --cc scripts/test_rustc_tests.sh
index ca07c59c3925bf91868560ea1e47929cec84bd2c,12ecb8cf4e17d6473d36610183c6e5224d196db9..81e287f1ddebf4301d5305c25b5acfaf048e675c
--- 1/scripts/test_rustc_tests.sh
--- 2/scripts/test_rustc_tests.sh
+++ b/scripts/test_rustc_tests.sh
@@@ -10,8 -10,8 +10,8 @@@ pushd rus
  
  command -v rg >/dev/null 2>&1 || cargo install ripgrep
  
- rm -r src/test/ui/{extern/,unsized-locals/,lto/,linkage*} || true
- for test in $(rg --files-with-matches "lto|// needs-asm-support|// needs-unwind" src/test/{codegen-units,ui,incremental}); do
+ rm -r tests/ui/{extern/,unsized-locals/,lto/,linkage*} || true
 -for test in $(rg --files-with-matches "lto|// needs-asm-support|// needs-unwind" tests/{ui,incremental}); do
++for test in $(rg --files-with-matches "lto|// needs-asm-support|// needs-unwind" tests/{codegen-units,ui,incremental}); do
    rm $test
  done
  
@@@ -26,38 -26,48 +26,38 @@@ git checkout -- tests/ui/proc-macro/pre
  # ================
  
  # requires stack unwinding
- rm src/test/incremental/change_crate_dep_kind.rs
- rm src/test/incremental/issue-80691-bad-eval-cache.rs # -Cpanic=abort causes abort instead of exit(101)
+ rm tests/incremental/change_crate_dep_kind.rs
+ rm tests/incremental/issue-80691-bad-eval-cache.rs # -Cpanic=abort causes abort instead of exit(101)
  
  # requires compiling with -Cpanic=unwind
- rm -r src/test/ui/macros/rfc-2011-nicer-assert-messages/
- rm -r src/test/run-make/test-benches
- rm src/test/ui/test-attrs/test-type.rs
+ rm -r tests/ui/macros/rfc-2011-nicer-assert-messages/
+ rm -r tests/run-make/test-benches
++rm tests/ui/test-attrs/test-type.rs
  
  # vendor intrinsics
- rm src/test/ui/sse2.rs # cpuid not supported, so sse2 not detected
- rm src/test/ui/intrinsics/const-eval-select-x86_64.rs # requires x86_64 vendor intrinsics
- rm src/test/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
- rm src/test/ui/simd/intrinsic/float-math-pass.rs # simd_fcos unimplemented
+ rm tests/ui/sse2.rs # cpuid not supported, so sse2 not detected
+ rm tests/ui/intrinsics/const-eval-select-x86_64.rs # requires x86_64 vendor intrinsics
+ rm tests/ui/simd/array-type.rs # "Index argument for `simd_insert` is not a constant"
 -rm tests/ui/simd/intrinsic/generic-bitmask-pass.rs # simd_bitmask unimplemented
 -rm tests/ui/simd/intrinsic/generic-as.rs # simd_as unimplemented
 -rm tests/ui/simd/intrinsic/generic-arithmetic-saturating-pass.rs # simd_saturating_add unimplemented
+ rm tests/ui/simd/intrinsic/float-math-pass.rs # simd_fcos unimplemented
 -rm tests/ui/simd/intrinsic/generic-gather-pass.rs # simd_gather unimplemented
 -rm tests/ui/simd/intrinsic/generic-select-pass.rs # simd_select_bitmask unimplemented
 -rm tests/ui/simd/issue-85915-simd-ptrs.rs # simd_gather unimplemented
 -rm tests/ui/simd/issue-89193.rs # simd_gather unimplemented
 -rm tests/ui/simd/simd-bitmask.rs # simd_bitmask unimplemented
  
  # exotic linkages
- rm src/test/ui/issues/issue-33992.rs # unsupported linkages
- rm src/test/incremental/hashes/function_interfaces.rs # same
- rm src/test/incremental/hashes/statics.rs # same
+ rm tests/ui/issues/issue-33992.rs # unsupported linkages
+ rm tests/incremental/hashes/function_interfaces.rs # same
+ rm tests/incremental/hashes/statics.rs # same
  
  # variadic arguments
- rm src/test/ui/abi/mir/mir_codegen_calls_variadic.rs # requires float varargs
- rm src/test/ui/abi/variadic-ffi.rs # requires callee side vararg support
+ rm tests/ui/abi/mir/mir_codegen_calls_variadic.rs # requires float varargs
+ rm tests/ui/abi/variadic-ffi.rs # requires callee side vararg support
  
  # unsized locals
- rm -r src/test/run-pass-valgrind/unsized-locals
+ rm -r tests/run-pass-valgrind/unsized-locals
  
  # misc unimplemented things
- rm src/test/ui/intrinsics/intrinsic-nearby.rs # unimplemented nearbyintf32 and nearbyintf64 intrinsics
- rm src/test/ui/target-feature/missing-plusminus.rs # error not implemented
- rm src/test/ui/fn/dyn-fn-alignment.rs # wants a 256 byte alignment
- rm -r src/test/run-make/emit-named-files # requires full --emit support
- rm -r src/test/run-make/repr128-dwarf # debuginfo test
+ rm tests/ui/intrinsics/intrinsic-nearby.rs # unimplemented nearbyintf32 and nearbyintf64 intrinsics
+ rm tests/ui/target-feature/missing-plusminus.rs # error not implemented
+ rm tests/ui/fn/dyn-fn-alignment.rs # wants a 256 byte alignment
+ rm -r tests/run-make/emit-named-files # requires full --emit support
 -rm tests/ui/abi/stack-probes.rs # stack probes not yet implemented
 -rm tests/ui/simd/intrinsic/ptr-cast.rs # simd_expose_addr intrinsic unimplemented
+ rm -r tests/run-make/repr128-dwarf # debuginfo test
 -rm tests/codegen-units/item-collection/asm-sym.rs # requires support for sym in asm!()
  
  # optimization tests
  # ==================
@@@ -90,23 -100,28 +90,23 @@@ rm -r tests/ui/consts/missing_span_in_b
  
  # genuine bugs
  # ============
- rm src/test/incremental/spike-neg1.rs # errors out for some reason
- rm src/test/incremental/spike-neg2.rs # same
+ rm tests/incremental/spike-neg1.rs # errors out for some reason
+ rm tests/incremental/spike-neg2.rs # same
 -rm tests/ui/issues/issue-74564-if-expr-stack-overflow.rs # gives a stackoverflow before the backend runs
 -rm tests/ui/mir/ssa-analysis-regression-50041.rs # produces ICE
 -rm tests/ui/type-alias-impl-trait/assoc-projection-ice.rs # produces ICE
  
- rm src/test/ui/simd/intrinsic/generic-reduction-pass.rs # simd_reduce_add_unordered doesn't accept an accumulator for integer vectors
+ rm tests/ui/simd/intrinsic/generic-reduction-pass.rs # simd_reduce_add_unordered doesn't accept an accumulator for integer vectors
  
- rm src/test/ui/simd/intrinsic/generic-as.rs # crash when accessing vector type filed (#1318)
- rm src/test/ui/simd/simd-bitmask.rs # crash
 -rm tests/ui/runtime/out-of-stack.rs # SIGSEGV instead of SIGABRT for some reason (#1301)
++rm tests/ui/simd/intrinsic/generic-as.rs # crash when accessing vector type filed (#1318)
++rm tests/ui/simd/simd-bitmask.rs # crash
  
  # bugs in the test suite
  # ======================
- rm src/test/ui/backtrace.rs # TODO warning
- rm src/test/ui/simple_global_asm.rs # TODO add needs-asm-support
- rm src/test/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
- rm src/test/ui/dyn-star/dispatch-on-pin-mut.rs # TODO failed assertion in vtable::get_ptr_and_method_ref
+ rm tests/ui/backtrace.rs # TODO warning
+ rm tests/ui/simple_global_asm.rs # TODO add needs-asm-support
 -rm tests/ui/test-attrs/test-type.rs # TODO panic message on stderr. correct stdout
 -# not sure if this is actually a bug in the test suite, but the symbol list shows the function without leading _ for some reason
 -rm -r tests/run-make/native-link-modifier-bundle
+ rm tests/ui/process/nofile-limit.rs # TODO some AArch64 linking issue
+ rm tests/ui/dyn-star/dispatch-on-pin-mut.rs # TODO failed assertion in vtable::get_ptr_and_method_ref
  
- rm src/test/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
+ rm tests/ui/stdio-is-blocking.rs # really slow with unoptimized libstd
  
  echo "[TEST] rustc test suite"
- RUST_TEST_NOCAPTURE=1 COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 src/test/{codegen-units,run-make,run-pass-valgrind,ui,incremental}
+ RUST_TEST_NOCAPTURE=1 COMPILETEST_FORCE_STAGE0=1 ./x.py test --stage 0 tests/{codegen-units,run-make,run-pass-valgrind,ui,incremental}
  popd

diff --cc src/debuginfo/mod.rs
Simple merge

diff --cc src/intrinsics/mod.rs
Simple merge