Skip to content

Remap syntax contexts and expansion ids for det. metadata encoding - #163668

Merged
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
aerooneqq:syntax-contexts-and-expansions-ids-remapping
Oct 21, 2026
Merged

Remap syntax contexts and expansion ids for det. metadata encoding#163668
rust-bors[bot] merged 1 commit into
rust-lang:mainfrom
aerooneqq:syntax-contexts-and-expansions-ids-remapping

Conversation

@aerooneqq

@aerooneqq aerooneqq commented Oct 2, 2026 •
edited by rustbot
Loading

Copy link
Copy Markdown
Contributor

View all comments

#163495 which parallelizes AST -> HIR lowering breaks det. encoding of syntax contexts and expansions, however this PR with #162809 should fix the problem.

Now draft for perf and CI (dont look at the code). Remapping of those entities can cost us much, because unlike def ids there may be many expansions and contexts after we committed end of determinism.

r? @petrochenkov

@rustbot rustbot added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Oct 2, 2026
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Oct 2, 2026
@petrochenkov

petrochenkov commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Oct 2, 2026
rust-bors Bot pushed a commit that referenced this pull request Oct 2, 2026
@bors
Auto merge of #163668 - aerooneqq:syntax-contexts-and-expansions-ids-…
1fbc989 
…remapping, r=<try>

Remap syntax contexts and expansion ids for det. metadata encoding
@rust-bors

This comment has been minimized.

Sign in to view
@aerooneqq
aerooneqq force-pushed the syntax-contexts-and-expansions-ids-remapping branch from 4195a79 to 46ee492 Compare October 2, 2026 15:57
@petrochenkov

petrochenkov commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

@bors try cancel

@rust-bors

rust-bors Bot commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

Try build cancelled. Cancelled workflows:

Hint: if you want to run another try build, you do not need to manually cancel the previous one. Just run @bors try and bors will cancel the previous build automatically.

@petrochenkov

petrochenkov commented Oct 2, 2026

Copy link
Copy Markdown
Contributor

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Oct 2, 2026
@bors
Auto merge of #163668 - aerooneqq:syntax-contexts-and-expansions-ids-…
19b2816 
…remapping, r=<try>

Remap syntax contexts and expansion ids for det. metadata encoding
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-bors

This comment was marked as outdated.

Sign in to view
@aerooneqq
aerooneqq force-pushed the syntax-contexts-and-expansions-ids-remapping branch 2 times, most recently from 07a0f64 to 43e622c Compare October 5, 2026 14:34
@aerooneqq

aerooneqq commented Oct 5, 2026

Copy link
Copy Markdown
Contributor Author

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

Sign in to view
@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Oct 5, 2026
@bors
Auto merge of #163668 - aerooneqq:syntax-contexts-and-expansions-ids-…
a7c6732 
…remapping, r=<try>

Remap syntax contexts and expansion ids for det. metadata encoding
@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-bors

rust-bors Bot commented Oct 5, 2026

Copy link
Copy Markdown
Contributor

☀️ Try build successful (CI)
Build commit: a7c6732 (a7c67326654d086b506b6f55d82af110f520b88b)
Base parent: 602727f (602727f26878dcf9eb2999e2f58e5df1269ff47e)

@rust-timer

This comment has been minimized.

Sign in to view
@rust-timer

rust-timer commented Oct 5, 2026

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (a7c6732): comparison URL.

Overall result: ❌✅ regressions and improvements - please read:

Benchmarking means the PR may be perf-sensitive. It's automatically marked not fit for rolling up. Overriding is possible but disadvised: it risks changing compiler perf.

Next, please: If you can, justify the regressions found in this try perf run in writing along with @rustbot label: +perf-regression-triaged. If not, fix the regressions and do another perf run. Neutral or positive results will clear the label automatically.

@bors rollup=never rustc-perf
@rustbot label: -S-waiting-on-perf +perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)		 0.7% [0.3%, 1.2%] 7
Regressions ❌
(secondary)		 - - 0
Improvements ✅
(primary)		 -0.2% [-1.2%, -0.1%] 57
Improvements ✅
(secondary)		 -0.3% [-0.7%, -0.1%] 28
All ❌✅ (primary) -0.1% [-1.2%, 1.2%] 64

Max RSS (memory usage)

Results (primary -2.9%, secondary -1.7%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 3.1% [3.1%, 3.1%] 1
Regressions ❌
(secondary)		 2.6% [1.6%, 6.6%] 9
Improvements ✅
(primary)		 -3.0% [-8.3%, -0.9%] 112
Improvements ✅
(secondary)		 -3.1% [-5.4%, -1.2%] 29
All ❌✅ (primary) -2.9% [-8.3%, 3.1%] 113

Cycles

Results (primary 11.8%, secondary 2.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 11.8% [2.3%, 27.3%] 15
Regressions ❌
(secondary)		 3.8% [3.0%, 4.5%] 5
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -4.4% [-4.4%, -4.4%] 1
All ❌✅ (primary) 11.8% [2.3%, 27.3%] 15

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 490.152s -> 495.841s (1.16%)
Artifact size: 408.63 MiB -> 408.61 MiB (-0.00%)

@rustbot rustbot added perf-regression Performance regression. and removed S-waiting-on-perf Status: Waiting on a perf run to be completed. labels Oct 5, 2026
@rust-bors

rust-bors Bot commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

✌️ @aerooneqq, you can now approve this pull request!

If @petrochenkov told you to "r=me" after making some further change, then please make that change and post @bors r=petrochenkov.

View changes since this delegation.

@rust-timer

rust-timer commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (01655d7): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking means the PR may be perf-sensitive. It's automatically marked not fit for rolling up. Overriding is possible but disadvised: it risks changing compiler perf.

@bors rollup=never rustc-perf
@rustbot label: -S-waiting-on-perf -perf-regression

Instruction count

Our most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 0.1% [0.1%, 0.1%] 1
Improvements ✅
(primary)		 -0.3% [-0.5%, -0.1%] 60
Improvements ✅
(secondary)		 -0.3% [-0.9%, -0.1%] 38
All ❌✅ (primary) -0.3% [-0.5%, -0.1%] 60

Max RSS (memory usage)

Results (secondary 0.4%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 3.1% [0.6%, 5.1%] 4
Improvements ✅
(primary)		 - - 0
Improvements ✅
(secondary)		 -2.3% [-3.8%, -1.0%] 4
All ❌✅ (primary) - - 0

Cycles

Results (primary -3.7%, secondary 0.5%)

A less reliable metric. May be of interest, but not used to determine the overall result above.

mean range count
Regressions ❌
(primary)		 - - 0
Regressions ❌
(secondary)		 3.3% [0.4%, 8.5%] 9
Improvements ✅
(primary)		 -3.7% [-6.5%, -2.1%] 3
Improvements ✅
(secondary)		 -2.4% [-5.0%, -0.5%] 9
All ❌✅ (primary) -3.7% [-6.5%, -2.1%] 3

Binary size

This perf run didn't have relevant results for this metric.

Bootstrap: 488.638s -> 489.798s (0.24%)
Artifact size: 409.06 MiB -> 409.14 MiB (0.02%)

@rustbot rustbot removed S-waiting-on-perf Status: Waiting on a perf run to be completed. perf-regression Performance regression. labels Oct 20, 2026
@aerooneqq

aerooneqq commented Oct 20, 2026

Copy link
Copy Markdown
Contributor Author

@bors squash msg="Remap syntax contexts and expansion ids for det. metadata encoding"

@rust-bors

This comment has been minimized.

Sign in to view
@rust-bors

rust-bors Bot commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

🔨 18 commits were squashed into 85108f2.

@rust-bors
rust-bors Bot force-pushed the syntax-contexts-and-expansions-ids-remapping branch from 18f7000 to 85108f2 Compare October 20, 2026 11:29
@aerooneqq

aerooneqq commented Oct 20, 2026

Copy link
Copy Markdown
Contributor Author

@bors r=petrochenkov

@rust-bors

rust-bors Bot commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 85108f2 has been tentatively approved by petrochenkov

It will be put into the queue for this repository once PR CI succeeds.

@rust-bors rust-bors Bot 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 20, 2026
@Kobzol

Kobzol commented Oct 20, 2026

Copy link
Copy Markdown
Member

Btw, you can also use @bors r+ squash msg="..." to do the squash and r+ in one step :)

@rust-bors

This comment has been minimized.

Sign in to view
rust-bors Bot pushed a commit that referenced this pull request Oct 20, 2026
@bors
Auto merge of #163668 - aerooneqq:syntax-contexts-and-expansions-ids-…
b695e7b 
…remapping, r=petrochenkov

Remap syntax contexts and expansion ids for det. metadata encoding



#163495 which parallelizes AST -> HIR lowering breaks det. encoding of syntax contexts and expansions, however this PR with #162809 should fix the problem.

Now draft for perf and CI (dont look at the code). Remapping of those entities can cost us much, because unlike def ids there may be many expansions and contexts after we committed end of determinism.

r? @petrochenkov
@rust-bors rust-bors Bot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 20, 2026
@rust-bors

rust-bors Bot commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

💔 Test for b695e7b failed: CI. Failed job:

@aerooneqq

aerooneqq commented Oct 20, 2026

Copy link
Copy Markdown
Contributor Author 
warning: spurious network error (3 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 5806 ms: Could not connect to server)
warning: spurious network error (3 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 6835 ms: Could not connect to server)
warning: spurious network error (3 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 7859 ms: Could not connect to server)
warning: spurious network error (3 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 8883 ms: Could not connect to server)
warning: spurious network error (2 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 2070 ms: Could not connect to server)
warning: spurious network error (2 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 1023 ms: Could not connect to server)
warning: spurious network error (3 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 11955 ms: Could not connect to server)
warning: spurious network error (3 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 12979 ms: Could not connect to server)
warning: spurious network error (2 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 5150 ms: Could not connect to server)
warning: spurious network error (3 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 15026 ms: Could not connect to server)
warning: spurious network error (2 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 8214 ms: Could not connect to server)
warning: spurious network error (2 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 3094 ms: Could not connect to server)
warning: spurious network error (1 try remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 4118 ms: Could not connect to server)
warning: spurious network error (2 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 5142 ms: Could not connect to server)
warning: spurious network error (1 try remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 5664 ms: Could not connect to server)
warning: spurious network error (1 try remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 3094 ms: Could not connect to server)
warning: spurious network error (1 try remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 1568 ms: Could not connect to server)
warning: spurious network error (2 tries remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 7167 ms: Could not connect to server)
warning: spurious network error (1 try remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 4118 ms: Could not connect to server)
warning: spurious network error (1 try remaining): [7] Could not connect to server (Failed to connect to static.crates.io:443 after 2070 ms: Could not connect to server)

@bors r=petrochenkov
@bors rollup=iffy

@rust-bors

rust-bors Bot commented Oct 20, 2026

Copy link
Copy Markdown
Contributor

📌 Commit 85108f2 has been approved by petrochenkov

It is now in the queue for this repository.

A failed build status on this PR was cleared due to the approval.

@rust-bors rust-bors Bot 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 20, 2026
@rust-log-analyzer

rust-log-analyzer commented Oct 20, 2026

Copy link
Copy Markdown
Collaborator

The job test-x86_64-gnu-llvm-22-3 failed! Check out the build log: (web) (plain enhanced) (plain)

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

JonathanBrouwer added a commit to JonathanBrouwer/rust that referenced this pull request Oct 20, 2026
@JonathanBrouwer
Rollup merge of rust-lang#163668 - aerooneqq:syntax-contexts-and-expa…
993f4b2 
…nsions-ids-remapping, r=petrochenkov

Remap syntax contexts and expansion ids for det. metadata encoding

rust-lang#163495 which parallelizes AST -> HIR lowering breaks det. encoding of syntax contexts and expansions, however this PR with rust-lang#162809 should fix the problem.

Now draft for perf and CI (dont look at the code). Remapping of those entities can cost us much, because unlike def ids there may be many expansions and contexts after we committed end of determinism.

r? @petrochenkov
@JonathanBrouwer JonathanBrouwer mentioned this pull request Oct 20, 2026
Closed
rust-bors Bot pushed a commit that referenced this pull request Oct 20, 2026
@bors
Auto merge of #164658 - JonathanBrouwer:rollup-Un6sNWx, r=JonathanBro…
cf4d022 
…uwer

Rollup of 19 pull requests

Successful merges:

 - #163664 (Add new `RUSTC_BOOTSTRAP=-allow-unstable-compiler-flags` mode for testing stable compiler behavior in UI tests)
 - #163668 (Remap syntax contexts and expansion ids for det. metadata encoding)
 - #160404 (fd-views: AsRef<File>&Co. for BorrowedFd)
 - #163104 ([debuginfo] Emit `usize` and `isize` as typedefs)
 - #163317 (Stop useless caching of post-LTO artifact caching for fat LTO)
 - #163701 (add ReadDir::dir to get the directory handle of the underlying directory)
 - #164488 (Don't try to skip anything in `Skip::advance_by(0)`)
 - #164507 (Encode HashMap and HashSet in deterministic order when an encoder requires determinism)
 - #164611 (Improve bit permutation codegen)
 - #164612 (std: Combine `is_powerpc64_feature_detected` into `is_powerpc_feature_detected`)
 - #148842 (Avoid incorrect lifetime suggestion involving `sym::anon`)
 - #162668 (document that `!` does bitwise and logical negation)
 - #164264 (lint: suggest `fXX::is_nan` for unsuffixed NaN comparisons)
 - #164509 (layout invariant: turn delayed bug back into proper assertion)
 - #164540 (Minor optimizations around macro parsing)
 - #164594 (rustdoc: Correctly handle inner `deprecated` attribute on modules)
 - #164595 (Allow attributes in function trait parameters)
 - #164641 (Stabilize `slice_split_once`)
 - #164646 (Adjust rustfmt subtree sync docs to not use `--allow-noop` for now)
@jhpratt jhpratt mentioned this pull request Oct 21, 2026
Merged
@github-actions github-actions Bot mentioned this pull request Oct 22, 2026
Merged
@aerooneqq aerooneqq mentioned this pull request Oct 22, 2026
Draft
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@petrochenkov petrochenkov

Labels

S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Milestone

1.101.0

Development

Successfully merging this pull request may close these issues.

6 participants

@aerooneqq @petrochenkov @rust-timer @rust-log-analyzer @rustbot @Kobzol