Rollup of 8 pull requests by matthiaskrgr · Pull Request #126781 · rust-lang/rust

matthiaskrgr · 2024-06-21T07:12:38Z

Successful merges:

Improve conflict marker recovery #126125 (Improve conflict marker recovery)
Add powerpc-unknown-openbsd maintenance status #126481 (Add powerpc-unknown-openbsd maintenance status)
Print the tested value in int_log tests #126613 (Print the tested value in int_log tests)
Expand avx512_target_feature to include VEX variants #126617 (Expand avx512_target_feature to include VEX variants)
Make edition dependent :expr macro fragment act like the edition-dependent :pat fragment does #126700 (Make edition dependent :expr macro fragment act like the edition-dependent :pat fragment does)
Pass target to inaccessible-temp-dir rmake test #126707 (Pass target to inaccessible-temp-dir rmake test)
StaticForeignItem and StaticItem are the same #126767 (StaticForeignItem and StaticItem are the same)
Fix another assertion failure for some Expect diagnostics. #126774 (Fix another assertion failure for some Expect diagnostics.)

r? @ghost
@rustbot modify labels: rollup

Very similar to rust-lang#126719. So much so that I added a new case to the test from that PR rather than creating a new one.

Improve conflict marker recovery  closes rust-lang#113826 r? ```@estebank``` since you reviewed rust-lang#115413 cc: ```@rben01``` since you opened up the issue in the first place

…, r=ehuss Add `powerpc-unknown-openbsd` maintenance status As noted in rust-lang#126451 (comment) `powerpc-unknown-openbsd` is not maintained by the OpenBSD devs. If a maintainer is found this can be updated with their information but we should document the current status and note explicitly that it's different from other OpenBSD targets.

Print the tested value in int_log tests Tiny change - from the failures in rust-lang#125016, it would have been nice to see what the tested values were. Update the assertion messages.

Expand `avx512_target_feature` to include VEX variants Added 5 new target features for x86: - `AVX-IFMA` - `AVX-NE-CONVERT` - `AVX-VNNI` - `AVX-VNNI_INT8` - `AVX-VNNI_INT16` Both LLVM and GCC already have support for these. See also the [stdarch PR](rust-lang/stdarch#1586)

Make edition dependent `:expr` macro fragment act like the edition-dependent `:pat` fragment does Parse the `:expr` fragment as `:expr_2021` in editions <=2021, and as `:expr` in edition 2024. This is similar to how we parse `:pat` as `:pat_param` in edition <=2018 and `:pat_with_or` in >=2021, and means we can get rid of a span dependency from `nonterminal_may_begin_with`. Specifically, this fixes a theoretical regression since the `expr_2021` macro fragment previously would allow `const {}` if the *caller* is edition 2024. This is inconsistent with the way that the `pat` macro fragment was upgraded, and also leads to surprising behavior when a macro *caller* crate upgrades to edtion 2024, since they may have parsing changes that they never asked for (with no way of opting out of it). This PR also allows using `expr_2021` in all editions. Why was this was disallowed in the first place? It's purely additive, and also it's still feature gated? r? ```@fmease``` ```@eholk``` cc ```@vincenzopalazzo``` cc rust-lang#123865 Tracking: - rust-lang#123742

…le-temp-dir, r=jieyouxu Pass target to inaccessible-temp-dir rmake test This PR circles back to do the target specific changes in `inaccessible-temp-dir` from rust-lang#126355. Specifically, this repairs the test on `riscv64gc-unknown-linux-gnu`. (The failure can be viewed in rust-lang#126641 -> https://github.com/rust-lang/rust/actions/runs/9571149616/job/26387537888?pr=126641) We removed this change from rust-lang#126355 to avoid a merge conflict with rust-lang#126279. (...and, because I hoped that would fix the test instead, but it did not.) ## Testing > [!NOTE] > `riscv64gc-unknown-linux-gnu` is a [**Tier 2 with Host Tools** platform](https://doc.rust-lang.org/beta/rustc/platform-support.html), all tests may not necessarily pass! This PR is specifically about the `inaccessible-temp-dir` rmake test. You can test out the job locally: ```sh DEPLOY=1 ./src/ci/docker/run.sh riscv64gc-gnu ``` `DEPLOY=1` helps reproduce the CI's environment and also avoids the chance of a `llvm-c/BitReader.h` error (detailed in rust-lang#85424 and rust-lang#56650). <details> <summary>tests/run-make/inaccessible-temp-dir failure</summary> ```bash ---- [run-make] tests/run-make/inaccessible-temp-dir stdout ---- ---- [run-make] tests/run-make/inaccessible-temp-dir stdout ---- error: rmake recipe failed to complete status: exit status: 1 command: cd "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out" && env -u RUSTFLAGS AR="riscv64-linux-gnu-ar" CC="riscv64-linux-gnu-gcc" CC_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -march=rv64gc -mabi=lp64d" CXX="riscv64-linux-gnu-g++" CXX_DEFAULT_FLAGS="-ffunction-sections -fdata-sections -fPIC -march=rv64gc -mabi=lp64d" HOST_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib" LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" LD_LIB_PATH_ENVVAR="LD_LIBRARY_PATH" LLVM_BIN_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/bin" LLVM_COMPONENTS="aarch64 aarch64asmparser aarch64codegen aarch64desc aarch64disassembler aarch64info aarch64utils aggressiveinstcombine all all-targets analysis arm armasmparser armcodegen armdesc armdisassembler arminfo armutils asmparser asmprinter avr avrasmparser avrcodegen avrdesc avrdisassembler avrinfo binaryformat bitreader bitstreamreader bitwriter bpf bpfasmparser bpfcodegen bpfdesc bpfdisassembler bpfinfo cfguard codegen codegentypes core coroutines coverage csky cskyasmparser cskycodegen cskydesc cskydisassembler cskyinfo debuginfobtf debuginfocodeview debuginfodwarf debuginfogsym debuginfologicalview debuginfomsf debuginfopdb demangle dlltooldriver dwarflinker dwarflinkerclassic dwarflinkerparallel dwp engine executionengine extensions filecheck frontenddriver frontendhlsl frontendoffloading frontendopenacc frontendopenmp fuzzercli fuzzmutate globalisel hexagon hexagonasmparser hexagoncodegen hexagondesc hexagondisassembler hexagoninfo hipstdpar instcombine instrumentation interfacestub interpreter ipo irprinter irreader jitlink libdriver lineeditor linker loongarch loongarchasmparser loongarchcodegen loongarchdesc loongarchdisassembler loongarchinfo lto m68k m68kasmparser m68kcodegen m68kdesc m68kdisassembler m68kinfo mc mca mcdisassembler mcjit mcparser mips mipsasmparser mipscodegen mipsdesc mipsdisassembler mipsinfo mirparser msp430 msp430asmparser msp430codegen msp430desc msp430disassembler msp430info native nativecodegen nvptx nvptxcodegen nvptxdesc nvptxinfo objcarcopts objcopy object objectyaml option orcdebugging orcjit orcshared orctargetprocess passes powerpc powerpcasmparser powerpccodegen powerpcdesc powerpcdisassembler powerpcinfo profiledata remarks riscv riscvasmparser riscvcodegen riscvdesc riscvdisassembler riscvinfo riscvtargetmca runtimedyld scalaropts selectiondag sparc sparcasmparser sparccodegen sparcdesc sparcdisassembler sparcinfo support symbolize systemz systemzasmparser systemzcodegen systemzdesc systemzdisassembler systemzinfo tablegen target targetparser textapi textapibinaryreader transformutils vectorize webassembly webassemblyasmparser webassemblycodegen webassemblydesc webassemblydisassembler webassemblyinfo webassemblyutils windowsdriver windowsmanifest x86 x86asmparser x86codegen x86desc x86disassembler x86info x86targetmca xray" LLVM_FILECHECK="/checkout/obj/build/x86_64-unknown-linux-gnu/llvm/build/bin/FileCheck" PYTHON="/usr/bin/python3" REMOTE_TEST_CLIENT="/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-tools-bin/remote-test-client" RUSTC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" RUSTC_LINKER="riscv64-linux-gnu-gcc" RUSTDOC="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustdoc" RUST_BUILD_STAGE="stage2-riscv64gc-unknown-linux-gnu" SOURCE_ROOT="/checkout" TARGET="riscv64gc-unknown-linux-gnu" TARGET_RPATH_DIR="/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/riscv64gc-unknown-linux-gnu/lib" TARGET_RPATH_ENV="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake" stdout: none --- stderr ------------------------------- command unexpectedly succeeded at line 33 Command { cmd: LD_LIBRARY_PATH="/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0-bootstrap-tools/x86_64-unknown-linux-gnu/release/deps:/checkout/obj/build/x86_64-unknown-linux-gnu/stage0/lib:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2-tools-bin:/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/lib/rustlib/x86_64-unknown-linux-gnu/lib" "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc" "-L" "/checkout/obj/build/x86_64-unknown-linux-gnu/test/run-make/inaccessible-temp-dir/inaccessible-temp-dir/rmake_out" "program.rs" "-Ztemps-dir=inaccessible/tmp", stdin: None, drop_bomb: DropBomb { command: "/checkout/obj/build/x86_64-unknown-linux-gnu/stage2/bin/rustc", defused: true, armed_line: 30 } } output status: `exit status: 0` === STDOUT === === STDERR === ``` </details>

…m, r=spastorino `StaticForeignItem` and `StaticItem` are the same The struct `StaticItem` and `StaticForeignItem` are the same, so remove `StaticForeignItem`. Having them be separate is unique to `static` items -- unlike `ForeignItemKind::{Fn,TyAlias}`, which use the normal AST item. r? ``@spastorino`` or ``@oli-obk``

Fix another assertion failure for some Expect diagnostics. Very similar to rust-lang#126719. So much so that I added a new case to the test from that PR rather than creating a new one. r? `@oli-obk`

matthiaskrgr · 2024-06-21T07:13:35Z

@bors r+ rollup=never p=8

bors · 2024-06-21T07:13:38Z

📌 Commit d86736c has been approved by matthiaskrgr

It is now in the queue for this repository.

bors · 2024-06-21T09:22:13Z

⌛ Testing commit d86736c with merge d40f30e...

bors · 2024-06-21T11:36:36Z

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

rust-timer · 2024-06-21T11:38:50Z

📌 Perf builds for each rolled up PR:

PR#	Message	Perf Build Sha
#126125	Improve conflict marker recovery	`906c52f0c060ad5a4db5e754e855ced520dcbab5` (link)
#126481	Add `powerpc-unknown-openbsd` maintenance status	`ad073c66cc0aa9654a3d23b927ab4468e8895d74` (link)
#126613	Print the tested value in int_log tests	`23b0f7db7b32e060915b984cae680764dc4534c2` (link)
#126617	Expand `avx512_target_feature` to include VEX variants	`3d052ae73f7d4caf0112dd700aec1a36421cd1c2` (link)
#126700	Make edition dependent `:expr` macro fragment act like the …	`1fc16694e9451ac8b68943faa21b2ed9210d8518` (link)
#126707	Pass target to inaccessible-temp-dir rmake test	`210715e0ba3e8aaad539c61ddc7560e73e44fcaa` (link)
#126767	`StaticForeignItem` and `StaticItem` are the same	`b51e2fd5957b09add48ab8b341787424e5239d09` (link)
#126774	Fix another assertion failure for some Expect diagnostics.	`ca26ebdc72420d0933d18fe3b138605d35753691` (link)

previous master: e32ea4822b

In the case of a perf regression, run the following command for each PR you suspect might be the cause: @rust-timer build $SHA

rust-timer · 2024-06-21T13:31:36Z

Finished benchmarking commit (d40f30e): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -perf-regression

Instruction count

This is a highly reliable metric that was used to determine the overall result at the top of this comment.

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

Max RSS (memory usage)

Results (secondary -4.5%)

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)	-	-	0
Improvements ✅ (secondary)	-4.5%	[-6.5%, -3.2%]	4
All ❌✅ (primary)	-	-	0

Cycles

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.2%, 3.1%]	4
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

Results (secondary 0.3%)

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.3%	[0.3%, 0.3%]	1
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Bootstrap: 696.377s -> 694.36s (-0.29%)
Artifact size: 326.82 MiB -> 326.84 MiB (0.01%)

ChrisDenton and others added 19 commits June 14, 2024 16:12

Add powerpc-unknown-openbsd maintaince status

9b22110

Print the tested value in int_log tests

c4ddc86

Improve conflict marker recovery

d51b446

make this comment correct

9f63712

Add the target-features

b6d20d1

Fix stderr cases

1e1b3fc

Add a test demonstrating the problem

50d1efa

Allow naming expr_2021 in all editions

3e8898a

Specify target for inaccessible-temp-dir rmake test

a656bb6

StaticForeignItem and StaticItem are the same

3e59f0c

Fix another assertion failure for some Expect diagnostics.

d6efcbb

Very similar to rust-lang#126719. So much so that I added a new case to the test from that PR rather than creating a new one.

Rollup merge of rust-lang#126613 - tgross35:log-test-update, r=cuviper

7a827d3

Print the tested value in int_log tests Tiny change - from the failures in rust-lang#125016, it would have been nice to see what the tested values were. Update the assertion messages.

Rollup merge of rust-lang#126774 - nnethercote:fix-126751, r=oli-obk

d86736c

Fix another assertion failure for some Expect diagnostics. Very similar to rust-lang#126719. So much so that I added a new case to the test from that PR rather than creating a new one. r? `@oli-obk`

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 21, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 21, 2024

bors merged commit d40f30e into rust-lang:master Jun 21, 2024

rustbot added this to the 1.81.0 milestone Jun 21, 2024

bors mentioned this pull request Jun 21, 2024

Add AMX target-features and x86_amx_intrinsics feature flag #126639

Merged

bors mentioned this pull request Jun 21, 2024

Added SHA512, SM3, SM4 target-features and sha512_sm_x86 feature gate #126704

Merged

matthiaskrgr deleted the rollup-5u4pens branch September 1, 2024 17:35

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Rollup of 8 pull requests#126781

Rollup of 8 pull requests#126781
bors merged 19 commits intorust-lang:masterfrom
matthiaskrgr:rollup-5u4pens

matthiaskrgr commented Jun 21, 2024

Uh oh!

matthiaskrgr commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

rust-timer commented Jun 21, 2024

Uh oh!

rust-timer commented Jun 21, 2024

Uh oh!

Reviewers

Assignees

Labels

Milestone

Conversation

matthiaskrgr commented Jun 21, 2024

Uh oh!

matthiaskrgr commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

bors commented Jun 21, 2024

Uh oh!

rust-timer commented Jun 21, 2024

Uh oh!

rust-timer commented Jun 21, 2024

Overall result: ✅ improvements - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Milestone