Use allocator_shim_contents in allocator_shim_symbols

[bjorn3]

No description provided.

[rustbot]

r? @jackh726

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

[rustbot]

This PR was rebased onto a different main commit. Here's a range-diff highlighting what actually changed.

Rebasing is a normal part of keeping PRs up to date, so no action is needed—this note is just to help reviewers.

[jackh726]

At first I thought this was trivial, but allocator_shim_contents conditions the return of these methods based on the AllocatorKind and alloc_error_handler_kind(). I assume this is correct, but please confirm why this is okay and this change is wanted.

In the future, it would be helpful to add something like the above to PR description. Particularly, these changes are not big and I could be pretty easily convinced they are appropriate, but even if I knew all about this area of the compiler (and I don't), it still would take me a minute to figure out what exactly the effect of the changes is and why they are okay.

View changes since this review

[bjorn3]

allocator_shim_symbols was previously assuming the default implementation for the allocator methods and alloc error handler when calculating which symbols are present. Because #[global_allocator]/#[alloc_error_handler] defines those same symbols it happened to work out, just with duplicate entries in the list of symbols to export. By passing AllocatorKind to allocator_shim_symbols we will accurately calculate the contents of the allocator shim and avoid duplicates.

[jackh726]

@bors r+

[rust-bors]

📌 Commit cb4c9d3 has been approved by jackh726

It is now in the queue for this repository.

[jhpratt]

This has been running for 5 hours. Viewing the logs, it appears to be stalled.

@bors cancel

[rust-bors]

Auto build cancelled. Cancelled workflows:

• https://github.com/rust-lang/rust/actions/runs/21304431551

The next pull request likely to be tested is #151562.

[jhpratt]

@bors r=jackh726

[rust-bors]

📌 Commit cb4c9d3 has been approved by jackh726

It is now in the queue for this repository.

[rust-bors]

💔 Test for a4ef00c failed: CI. Failed job:

• auto - x86_64-gnu-llvm-20-1 (web logs, enhanced plaintext logs)

[jhpratt]

spurious network error

@bors retry

[rust-log-analyzer]

The job x86_64-gnu-llvm-20-1 failed! Check out the build log: (web) (plain enhanced) (plain)

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

REPOSITORY                                   TAG       IMAGE ID       CREATED      SIZE
ghcr.io/dependabot/dependabot-updater-core   latest    354d02aa29ac   4 days ago   783MB
=> Removing docker images...
Deleted Images:
untagged: ghcr.io/dependabot/dependabot-updater-core:latest
untagged: ghcr.io/dependabot/dependabot-updater-core@sha256:596da3f22bcbdff2c96fd7126001278022c834c1621c5efa2ad1a7794590636c
deleted: sha256:354d02aa29acf525570c732b6e006ecf138de6d63ca525d552eb4b24880ddc6c
deleted: sha256:8b7af0e426bc2cbeeacfd96b8354d3b80016991520977197e62090e47abaede8
deleted: sha256:cadf11ef1de7fdd5eab563757942353684047f09b212dc99d6ed48e8acf34d62
deleted: sha256:569b0caf9d5285db44ccd2629a3470139eea755be423a33a54d8a24cb3926bfa
deleted: sha256:f9dc5feb048d8f9fd43137e3998f59e9acfbd76c47a4e14984d109654119e282
---
warning: spurious network error (1 try remaining): [6] Could not resolve hostname (Could not resolve host: index.crates.io)
error: failed to get `tikv-jemalloc-sys` as a dependency of package `rustc-main v0.0.0 (/checkout/compiler/rustc)`

Caused by:
  download of ti/kv/tikv-jemalloc-sys failed

Caused by:
  failed to download from `https://index.crates.io/ti/kv/tikv-jemalloc-sys`

Caused by:
  [6] Could not resolve hostname (Could not resolve host: index.crates.io)
Bootstrap failed while executing `--stage 2 test --skip tests --skip coverage-map --skip coverage-run --skip library --skip tidyselftest`
Build completed unsuccessfully in 0:00:47

[rust-bors]

☀️ Test successful - CI
Approved by: jackh726
Duration: 3h 13m 3s
Pushing 87b2721 to main...

[github-actions]

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 d222ddc (parent) -> 87b2721 (this PR)

Test differences

Show 4 test diffs

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

Test dashboard

Run

cargo run --manifest-path src/ci/citool/Cargo.toml -- \
    test-dashboard 87b272187129343c0efc8f92d253c16958aeac0b --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-apple-various: 4706.5s -> 3578.9s (-24.0%)
2. aarch64-apple: 11227.9s -> 8687.9s (-22.6%)
3. i686-gnu-2: 5136.6s -> 6123.6s (+19.2%)
4. x86_64-gnu-miri: 4104.9s -> 4747.8s (+15.7%)
5. i686-gnu-nopt-1: 7279.9s -> 8328.4s (+14.4%)
6. tidy: 143.6s -> 164.2s (+14.4%)
7. dist-aarch64-apple: 8515.8s -> 7400.1s (-13.1%)
8. i686-gnu-1: 7391.0s -> 8311.6s (+12.5%)
9. i686-gnu-nopt-2: 7662.9s -> 8588.5s (+12.1%)
10. dist-various-2: 2360.3s -> 2100.1s (-11.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]

Finished benchmarking commit (87b2721): 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 -1.7%, 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)	4.4%	[4.4%, 4.4%]	1
Improvements ✅ (primary)	-1.7%	[-1.7%, -1.7%]	1
Improvements ✅ (secondary)	-3.6%	[-3.6%, -3.6%]	1
All ❌✅ (primary)	-1.7%	[-1.7%, -1.7%]	1

Cycles

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

Binary size

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

Bootstrap: 470.684s -> 471.473s (0.17%)
Artifact size: 383.48 MiB -> 383.50 MiB (0.00%)