Skip to content

Revert "Rollup merge of #154200 - resrever:enable-dwarf-call-sites, r=dingxiangfei2009"#154468

Merged
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Kobzol:revert-154200
Mar 28, 2026
Merged

Revert "Rollup merge of #154200 - resrever:enable-dwarf-call-sites, r=dingxiangfei2009"#154468
rust-bors[bot] merged 1 commit intorust-lang:mainfrom
Kobzol:revert-154200

Conversation

@Kobzol
Copy link
Copy Markdown
Member

@Kobzol Kobzol commented Mar 27, 2026

This reverts commit 2f16030, reversing
changes made to 6e3c174.

Debugging perf. hit from #154384.

The binary size hits from #154468 (comment) were due to this PR, not all of the copmile-time hits though.

@rustbot rustbot added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Mar 27, 2026
@Kobzol
Copy link
Copy Markdown
Member Author

Kobzol commented Mar 27, 2026

@bors try @rust-timer queue

@rust-timer

This comment has been minimized.

@rust-bors

This comment has been minimized.

rust-bors bot pushed a commit that referenced this pull request Mar 27, 2026
Revert "Rollup merge of #154200 - resrever:enable-dwarf-call-sites, r=dingxiangfei2009"
@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 27, 2026
@rust-log-analyzer

This comment has been minimized.

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 27, 2026

☀️ Try build successful (CI)
Build commit: 1be14f9 (1be14f9c29eac4f8fbbc914df19f7a287c41ed9d, parent: fda6d37bb88ee12fd50fa54d15859f1f91b74f55)

@rust-timer

This comment has been minimized.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (1be14f9): comparison URL.

Overall result: ✅ improvements - no action needed

Benchmarking this pull request means it may be perf-sensitive – we'll automatically label it not fit for rolling up. You can override this, but we strongly advise not to, due to possible changes in compiler perf.

@bors rollup=never
@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
Improvements ✅
(primary)
-0.5% [-1.0%, -0.2%] 18
Improvements ✅
(secondary)
-0.6% [-0.9%, -0.3%] 20
All ❌✅ (primary) -0.5% [-1.0%, -0.2%] 18

Max RSS (memory usage)

Results (primary -0.7%, secondary 2.3%)

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

mean range count
Regressions ❌
(primary)
3.2% [3.2%, 3.2%] 1
Regressions ❌
(secondary)
5.8% [4.4%, 7.2%] 2
Improvements ✅
(primary)
-2.0% [-2.2%, -1.8%] 3
Improvements ✅
(secondary)
-4.6% [-4.6%, -4.6%] 1
All ❌✅ (primary) -0.7% [-2.2%, 3.2%] 4

Cycles

Results (primary 2.5%, secondary -3.7%)

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

mean range count
Regressions ❌
(primary)
2.5% [2.5%, 2.5%] 1
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
- - 0
Improvements ✅
(secondary)
-3.7% [-5.0%, -2.5%] 2
All ❌✅ (primary) 2.5% [2.5%, 2.5%] 1

Binary size

Results (primary -1.7%, 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)
- - 0
Regressions ❌
(secondary)
- - 0
Improvements ✅
(primary)
-1.7% [-3.5%, -0.0%] 72
Improvements ✅
(secondary)
-1.7% [-4.4%, -0.0%] 71
All ❌✅ (primary) -1.7% [-3.5%, -0.0%] 72

Bootstrap: 485.109s -> 494.056s (1.84%)
Artifact size: 395.05 MiB -> 394.95 MiB (-0.02%)

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Mar 27, 2026
@Kobzol Kobzol marked this pull request as ready for review March 27, 2026 19:07
@rustbot rustbot added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 27, 2026
@rustbot rustbot removed the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Mar 27, 2026
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 27, 2026

r? @dingxiangfei2009

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

Why was this reviewer chosen?

The reviewer was selected based on:

  • Owners of files modified in this PR: compiler, debuginfo
  • compiler, debuginfo expanded to 69 candidates
  • Random selection from 12 candidates

@rustbot

This comment has been minimized.

…-sites, r=dingxiangfei2009"

This reverts commit 2f16030, reversing
changes made to 6e3c174.
@rustbot
Copy link
Copy Markdown
Collaborator

rustbot commented Mar 27, 2026

⚠️ Warning ⚠️

  • There are issue links (such as #123) in the commit messages of the following commits.
    Please move them to the PR description, to avoid spamming the issues with references to the commit, and so this bot can automatically canonicalize them to avoid issues with subtree.

@dingxiangfei2009
Copy link
Copy Markdown
Contributor

@bors r+ rollup=always

@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 27, 2026

📌 Commit 8b44562 has been approved by dingxiangfei2009

It is now in the queue for this repository.

@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 Mar 27, 2026
@dingxiangfei2009
Copy link
Copy Markdown
Contributor

This looks like a binary size improvement that is large enough.

@JonathanBrouwer
Copy link
Copy Markdown
Contributor

This has perf effect, so @bors rollup=never

@rust-bors

This comment has been minimized.

@rust-bors rust-bors bot added merged-by-bors This PR was explicitly merged by bors. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Mar 28, 2026
@rust-bors
Copy link
Copy Markdown
Contributor

rust-bors bot commented Mar 28, 2026

☀️ Test successful - CI
Approved by: dingxiangfei2009
Duration: 3h 13m 6s
Pushing fb27476 to main...

@rust-bors rust-bors bot merged commit fb27476 into rust-lang:main Mar 28, 2026
12 checks passed
@rustbot rustbot added this to the 1.96.0 milestone Mar 28, 2026
@github-actions
Copy link
Copy Markdown
Contributor

What is this? This is an experimental post-merge analysis report that shows differences in test outcomes between the merged PR and its parent PR.

Comparing 0d4eb09 (parent) -> fb27476 (this PR)

Test differences

Show 5 test diffs

Stage 1

  • [codegen] tests/codegen-llvm/debuginfo-callsite-flag.rs: pass -> [missing] (J1)

Stage 2

  • [codegen] tests/codegen-llvm/debuginfo-callsite-flag.rs: ignore (ignored when the target environment is msvc ((CodeView does not use DIFlagAllCallsDescribed))) -> [missing] (J0)
  • [codegen] tests/codegen-llvm/debuginfo-callsite-flag.rs: pass -> [missing] (J2)

Additionally, 2 doctest diffs were found. These are ignored, as they are noisy.

Job group index

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard fb27476aaf1012f1f6ace6306f9b990e0d989c31 --output-dir test-dashboard

And then open test-dashboard/index.html in your browser to see an overview of all executed tests.

Job duration changes

  1. dist-aarch64-apple: 2h 11m -> 1h 34m (-28.0%)
  2. x86_64-gnu-llvm-21-2: 1h 44m -> 1h 22m (-21.1%)
  3. armhf-gnu: 1h 38m -> 1h 18m (-20.2%)
  4. aarch64-gnu-debug: 1h 18m -> 1h 5m (-16.6%)
  5. x86_64-gnu-stable: 2h 41m -> 2h 16m (-15.8%)
  6. optional-x86_64-gnu-parallel-frontend: 2h 45m -> 2h 20m (-15.3%)
  7. dist-aarch64-llvm-mingw: 1h 30m -> 1h 44m (+15.1%)
  8. aarch64-gnu-llvm-21-1: 1h -> 51m 38s (-15.0%)
  9. pr-check-2: 44m 22s -> 37m 59s (-14.4%)
  10. pr-check-1: 31m 30s -> 27m 5s (-14.0%)
How to interpret the job duration changes?

Job durations can vary a lot, based on the actual runner instance
that executed the job, system noise, invalidated caches, etc. The table above is provided
mostly for t-infra members, for simpler debugging of potential CI slow-downs.

@rust-timer
Copy link
Copy Markdown
Collaborator

Finished benchmarking commit (fb27476): comparison URL.

Overall result: ✅ improvements - no action needed

@rustbot label: -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
Improvements ✅
(primary)
-0.5% [-1.0%, -0.2%] 34
Improvements ✅
(secondary)
-0.6% [-1.0%, -0.1%] 25
All ❌✅ (primary) -0.5% [-1.0%, -0.2%] 34

Max RSS (memory usage)

Results (primary -1.8%)

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)
- - 0
Improvements ✅
(primary)
-1.8% [-1.8%, -1.7%] 2
Improvements ✅
(secondary)
- - 0
All ❌✅ (primary) -1.8% [-1.8%, -1.7%] 2

Cycles

Results (primary 1.6%, secondary -2.6%)

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

mean range count
Regressions ❌
(primary)
7.5% [7.5%, 7.5%] 1
Regressions ❌
(secondary)
2.9% [2.9%, 2.9%] 1
Improvements ✅
(primary)
-4.2% [-4.2%, -4.2%] 1
Improvements ✅
(secondary)
-4.0% [-6.0%, -2.8%] 4
All ❌✅ (primary) 1.6% [-4.2%, 7.5%] 2

Binary size

Results (primary -1.6%, secondary -1.6%)

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)
- - 0
Improvements ✅
(primary)
-1.6% [-3.4%, -0.0%] 72
Improvements ✅
(secondary)
-1.6% [-4.4%, -0.0%] 71
All ❌✅ (primary) -1.6% [-3.4%, -0.0%] 72

Bootstrap: 485.141s -> 484.782s (-0.07%)
Artifact size: 394.93 MiB -> 394.81 MiB (-0.03%)

@rust-log-analyzer
Copy link
Copy Markdown
Collaborator

A job failed! Check out the build log: (web) (plain enhanced) (plain)

Click to see the possible cause of the failure (guessed by this bot)
  COMMIT_MESSAGE: cargo update 
##[endgroup]
Downloading single artifact
Preparing to download the following artifacts:
- Cargo-lock (ID: 6162220363, Size: 50715, Expected Digest: sha256:6fc2ef94fe9a060d272c82312dd8240925039f0fd495b9ff41d2940a001c5985)
Redirecting to blob download url: https://productionresultssa12.blob.core.windows.net/actions-results/a0ab93b2-413c-418c-a37d-df630b894292/workflow-job-run-9bf1e437-cade-5192-aa48-e6edad1a5e3e/artifacts/858175980ba8726bab9f963fd06060d5199d874bbd735e523e2d990d354f8c0b.zip
Starting download of artifact to: /home/runner/work/rust/rust
(node:2304) [DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead.
(Use `node --trace-deprecation ...` to show where the warning was created)
SHA256 digest of downloaded artifact is 6fc2ef94fe9a060d272c82312dd8240925039f0fd495b9ff41d2940a001c5985
Artifact download completed successfully.
Total of 1 artifact(s) downloaded
Download artifact has finished successfully
---
  COMMIT_MESSAGE: cargo update 
##[endgroup]
Downloading single artifact
Preparing to download the following artifacts:
- cargo-updates (ID: 6162220463, Size: 2628, Expected Digest: sha256:89ccd4a580d70f2bc1ff72c8c3a94052185f3a84f3c4ab1642eadd986f39a81b)
Redirecting to blob download url: https://productionresultssa12.blob.core.windows.net/actions-results/a0ab93b2-413c-418c-a37d-df630b894292/workflow-job-run-9bf1e437-cade-5192-aa48-e6edad1a5e3e/artifacts/ce9034d4568b3430f906da1368ae1cf3e14ef1542859eb2e8d635c0876371f53.zip
Starting download of artifact to: /home/runner/work/rust/rust
(node:2315) [DEP0005] DeprecationWarning: Buffer() is deprecated due to security and usability issues. Please use the Buffer.alloc(), Buffer.allocUnsafe(), or Buffer.from() methods instead.
(Use `node --trace-deprecation ...` to show where the warning was created)
SHA256 digest of downloaded artifact is 89ccd4a580d70f2bc1ff72c8c3a94052185f3a84f3c4ab1642eadd986f39a81b
Artifact download completed successfully.
Total of 1 artifact(s) downloaded
Download artifact has finished successfully
##[group]Run echo "${COMMIT_MESSAGE}" > commit.txt
echo "${COMMIT_MESSAGE}" > commit.txt
cat cargo_update.log >> commit.txt

echo "${PR_MESSAGE}" > body.md
echo '```txt' >> body.md
cat cargo_update.log >> body.md
echo '```' >> body.md
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
dep-bumps
following is the output from `cargo update`:
  COMMIT_MESSAGE: cargo update 
##[endgroup]
##[group]Run git config user.name github-actions
git config user.name github-actions
git config user.email github-actions@github.com
git switch --force-create cargo_update
git add ./Cargo.lock ./library/Cargo.lock ./src/tools/rustbook/Cargo.lock
git commit --no-verify --file=commit.txt
shell: /usr/bin/bash --noprofile --norc -e -o pipefail {0}
---
dep-bumps
following is the output from `cargo update`:
  COMMIT_MESSAGE: cargo update 
##[endgroup]
remote: error: GH006: Protected branch update failed for refs/heads/cargo_update.        
remote: 
remote: - Cannot force-push to this branch        
To https://github.com/rust-lang/rust
 ! [remote rejected]   cargo_update -> cargo_update (protected branch hook declined)
error: failed to push some refs to 'https://github.com/rust-lang/rust'
##[error]Process completed with exit code 1.
Post job cleanup.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. merged-by-bors This PR was explicitly merged by bors. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants