Pass end position of span through inline ASM cookie by beetrees · Pull Request #129181 · rust-lang/rust

beetrees · 2024-08-17T04:35:14Z

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 · 2024-08-17T04:35:22Z

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 · 2024-08-17T12:58:37Z

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 · 2024-09-19T01:13:22Z

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

pnkfelix · 2024-10-04T19:18:09Z

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 · 2024-10-04T19:18:27Z

@bors try

pnkfelix · 2024-10-04T19:19:10Z

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

bors · 2024-10-04T19:19:40Z

🔒 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:

git checkout asm-spans(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
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 · 2024-10-04T19:20:13Z

@rustbot author

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

beetrees · 2024-10-12T23:48:28Z

Rebased

@rustbot ready

pnkfelix · 2024-10-16T14:23:09Z

@bors r+

bors · 2024-10-16T14:23:12Z

📌 Commit 29ae617 has been approved by pnkfelix

It is now in the queue for this repository.

Pass end position of span through inline ASM cookie 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.

Rollup of 10 pull requests Successful merges: - rust-lang#129181 (Pass end position of span through inline ASM cookie) - rust-lang#130989 (Don't check unsize goal in MIR validation when opaques remain) - rust-lang#131657 (Rustfmt `for<'a> async` correctly) - rust-lang#131691 (Delay ambiguous intra-doc link resolution after `Cache` has been populated) - rust-lang#131730 (Refactor some `core::fmt` macros) - rust-lang#131751 (Rename `can_coerce` to `may_coerce`, and then structurally resolve correctly in the probe) - rust-lang#131753 (Unify `secondary_span` and `swap_secondary_and_primary` args in `note_type_err`) - rust-lang#131776 (Emscripten: Xfail backtrace ui tests) - rust-lang#131777 (Fix trivially_copy_pass_by_ref in stable_mir) - rust-lang#131778 (Fix needless_lifetimes in stable_mir) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2024-10-16T18:15:16Z

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

Urgau · 2024-10-16T18:15:57Z

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

beetrees · 2024-10-16T21:15:40Z

Should be fixed now.

@rustbot ready

bors · 2024-11-04T04:33:03Z

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

compiler-errors · 2024-12-11T23:55:38Z

@bors r=pnkfelix,compiler-errors

bors · 2024-12-11T23:55:41Z

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

It is now in the queue for this repository.

bors · 2024-12-12T02:34:10Z

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

bors · 2024-12-12T05:17:40Z

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

rust-timer · 2024-12-12T06:35:27Z

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%)

rustbot assigned pnkfelix Aug 17, 2024

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Aug 17, 2024

This comment has been minimized.
Sign in to view

beetrees force-pushed the asm-spans branch from a33cae6 to 78bcfc3Compare August 17, 2024 11:39

beetrees marked this pull request as ready for review August 17, 2024 12:56

pnkfelix reviewed Oct 4, 2024
View reviewed changes

Comment threadcompiler/rustc_codegen_llvm/src/asm.rs Outdated

rustbot added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 4, 2024

beetrees force-pushed the asm-spans branch from 78bcfc3 to 29ae617Compare October 12, 2024 23:46

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 12, 2024

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 Oct 16, 2024

Urgau mentioned this pull request Oct 16, 2024
Rollup of 10 pull requests #131785
Closed

bors removed the S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. label Oct 16, 2024

bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 16, 2024

beetrees force-pushed the asm-spans branch from 29ae617 to abef761Compare October 16, 2024 19:33

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 16, 2024

Pass end position of span through inline ASM cookie
68227a3

beetrees force-pushed the asm-spans branch from abef761 to 68227a3Compare November 26, 2024 13:09

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 Dec 11, 2024

bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 12, 2024

bors merged commit 903d297 into rust-lang:masterDec 12, 2024

rustbot added this to the 1.85.0 milestone Dec 12, 2024

beetrees deleted the asm-spans branch December 12, 2024 05:19

Uh oh!

Uh oh!

Conversation

beetrees commented Aug 17, 2024• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rustbot commented Aug 17, 2024

Uh oh!

This comment has been minimized.

beetrees commented Aug 17, 2024

Uh oh!

bors commented Sep 19, 2024

Uh oh!

Uh oh!

pnkfelix commented Oct 4, 2024

Uh oh!

pnkfelix commented Oct 4, 2024

Uh oh!

pnkfelix commented Oct 4, 2024

Uh oh!

bors commented Oct 4, 2024

Uh oh!

pnkfelix commented Oct 4, 2024

Uh oh!

beetrees commented Oct 12, 2024

Uh oh!

pnkfelix commented Oct 16, 2024

Uh oh!

bors commented Oct 16, 2024

Uh oh!

matthiaskrgr commented Oct 16, 2024

Uh oh!

Urgau commented Oct 16, 2024

Uh oh!

beetrees commented Oct 16, 2024

Uh oh!

bors commented Nov 4, 2024

Uh oh!

compiler-errors commented Dec 11, 2024

Uh oh!

bors commented Dec 11, 2024

Uh oh!

bors commented Dec 12, 2024

Uh oh!

bors commented Dec 12, 2024

Uh oh!

rust-timer commented Dec 12, 2024

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

beetrees commented Aug 17, 2024•
edited
Loading