Pass end position of span through inline ASM cookie

[beetrees]

Before this PR, only the start position of the span was passed though the inline ASM cookie to diagnostics. LLVM 19 has full support for 64-bit inline ASM cookies; this PR uses that to pass the end position of the span in the upper 32 bits, meaning inline ASM diagnostics now point at the entire line the error occurred on, not just the first character of it.

[rustbot]

r? @pnkfelix

rustbot has assigned @pnkfelix.
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

[beetrees]

Should now be ready. I've set a try-job for LLVM 18 since it's not tested in PR CI if someone could do a @bors try.

[bors]

☔ The latest upstream changes (presumably #130534) made this pull request unmergeable. Please resolve the merge conflicts.

[pnkfelix]

Sorry for the delay in review.

I posted a suggestion for the comments, but its not needed to pass review.

so r=me once this is rebased.

[pnkfelix]

@bors try

[pnkfelix]

(or wait, does is a try build done against a merge, which will obviously fail here? Sorry again.)

[bors]

🔒 Merge conflict

This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again.

How do I rebase?

Assuming self is your fork and upstream is this repository, you can resolve the conflict following these steps:

1. git checkout asm-spans (switch to your branch)
2. git fetch upstream master (retrieve the latest master)
3. git rebase upstream/master -p (rebase on top of it)
4. Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
5. git push self asm-spans --force-with-lease (update this PR)

You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial.

Please avoid the "Resolve conflicts" button on GitHub. It uses git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

Auto-merging tests/ui/asm/inline-syntax.x86_64.stderr
CONFLICT (content): Merge conflict in tests/ui/asm/inline-syntax.x86_64.stderr
Auto-merging tests/ui/asm/inline-syntax.rs
CONFLICT (content): Merge conflict in tests/ui/asm/inline-syntax.rs
CONFLICT (modify/delete): tests/ui/asm/inline-syntax.arm_llvm_18.stderr deleted in HEAD and modified in heads/homu-tmp. Version heads/homu-tmp of tests/ui/asm/inline-syntax.arm_llvm_18.stderr left in tree.
Auto-merging tests/ui/asm/inline-syntax.arm.stderr
CONFLICT (content): Merge conflict in tests/ui/asm/inline-syntax.arm.stderr
Auto-merging compiler/rustc_span/src/lib.rs
Auto-merging compiler/rustc_llvm/llvm-wrapper/RustWrapper.cpp
Auto-merging compiler/rustc_codegen_ssa/src/back/write.rs
Auto-merging compiler/rustc_codegen_llvm/src/llvm/ffi.rs
Auto-merging compiler/rustc_codegen_llvm/src/back/write.rs
CONFLICT (content): Merge conflict in compiler/rustc_codegen_llvm/src/back/write.rs
Auto-merging compiler/rustc_codegen_llvm/src/asm.rs
CONFLICT (content): Merge conflict in compiler/rustc_codegen_llvm/src/asm.rs
Automatic merge failed; fix conflicts and then commit the result.

[pnkfelix]

@rustbot author

just switching to waiting-on-author for the rebase of the PR.

[beetrees]

Rebased

@rustbot ready

[pnkfelix]

@bors r+

[bors]

📌 Commit 29ae617 has been approved by pnkfelix

It is now in the queue for this repository.

[matthiaskrgr]

@bors r- rollup=iffy
failed in #131785 (comment) I guess

[Urgau]

Failed in rollup #131785 (comment)
@bors r-

[beetrees]

Should be fixed now.

@rustbot ready

[bors]

☔ The latest upstream changes (presumably #132581) made this pull request unmergeable. Please resolve the merge conflicts.

[compiler-errors]

@bors r=pnkfelix,compiler-errors

[bors]

📌 Commit 68227a3 has been approved by pnkfelix,compiler-errors

It is now in the queue for this repository.

[bors]

⌛ Testing commit 68227a3 with merge 903d297...

[bors]

☀️ Test successful - checks-actions
Approved by: pnkfelix,compiler-errors
Pushing 903d297 to master...

[rust-timer]

Finished benchmarking commit (903d297): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

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

Max RSS (memory usage)

Results (primary -0.7%, secondary -0.2%)

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)	2.6%	[2.6%, 2.6%]	1
Regressions ❌ (secondary)	4.4%	[4.4%, 4.4%]	1
Improvements ✅ (primary)	-2.3%	[-3.3%, -1.3%]	2
Improvements ✅ (secondary)	-1.8%	[-2.1%, -1.5%]	3
All ❌✅ (primary)	-0.7%	[-3.3%, 2.6%]	3

Cycles

Results (secondary -3.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)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-3.9%, -2.9%]	5
All ❌✅ (primary)	-	-	0

Binary size

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

Bootstrap: 769.999s -> 769.893s (-0.01%)
Artifact size: 331.03 MiB -> 331.00 MiB (-0.01%)