Repository navigation
Treat all proc macro dependencies as host dependencies in bootstrap - #165641
Conversation
|
r? @jieyouxu rustbot has assigned @jieyouxu. Use Why was this reviewer chosen?The reviewer was selected based on:
|
|
@bors try jobs=dist-x86_64-linux,dist-s390x-linux |
Treat all proc macro dependencies as host dependencies in bootstrap try-job: dist-x86_64-linux try-job: dist-s390x-linux
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
|
I think this causes the target proc-macros to be omitted from rustc-dev, breaking rustc-dev. |
|
💔 Test for 281011f failed: CI. Failed job:
|
62b7880 to
83b970d
Compare
|
@bors try jobs=dist-x86_64-linux,dist-s390x-linux |
This comment has been minimized.
This comment has been minimized.
Treat all proc macro dependencies as host dependencies in bootstrap try-job: dist-x86_64-linux try-job: dist-s390x-linux
|
@rust-timer build=54ebbd7a7f69c528472653a7eeb80ac3d83ea368 |
|
Unknown rust-timer command: build=54ebbd7a7f69c528472653a7eeb80ac3d83ea368 |
|
@rust-timer build 54ebbd7 |
|
Missing artifact for sha |
|
@bors try @rust-timer queue |
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
This comment has been minimized.
Treat all proc macro dependencies as host dependencies in bootstrap
|
Ok, the 390x archive no longer contains the proc macros, but rustc-dev still contains them, good. Btw |
83b970d to
d65990d
Compare
|
@rustbot ready |
This comment has been minimized.
This comment has been minimized.
|
Finished benchmarking commit (69ae83c): comparison URL. Overall result: no relevant changes - no action neededBenchmarking means the PR may be perf-sensitive. Consider adding rollup=never if this change is not fit for rolling up. @rustbot label: -S-waiting-on-perf -perf-regression Instruction countThis perf run didn't have relevant results for this metric. Max RSS (memory usage)This perf run didn't have relevant results for this metric. CyclesResults (primary -2.4%)A less reliable metric. May be of interest, but not used to determine the overall result above.
Binary sizeThis perf run didn't have relevant results for this metric. Bootstrap: 483.518s -> 483.731s (0.04%) |
d65990d to
911d542
Compare
|
@bors r=jieyouxu |
|
📌 Commit 911d542 has been tentatively approved by It will be put into the queue for this repository once PR CI succeeds. 🌲 The tree is currently closed for pull requests below priority 100. This pull request will be tested once the tree is reopened. Reason for tree closure: |
Treat all proc macro dependencies as host dependencies in bootstrap I think that the name `Host` was not fully accurate, and we were only adding proc macros as Host deps anyway. This PR renames Host to ProcMacro, and records *all* proc macro dependencies produced by cargo in bootstrap builds. So even if you cross-compile from T1 to T2, and you build proc macros for both T1 and T2, we will now record also proc macros for T2 to be Host/ProcMacro dependencies. So they should be correctly filtered when assembling the toolchain. Kinda hard to tell if this won't break anything, but at least when cross-compiling compiler and library, the deps looked reasonable to me. Fixes: rust-lang#165478
Treat all proc macro dependencies as host dependencies in bootstrap I think that the name `Host` was not fully accurate, and we were only adding proc macros as Host deps anyway. This PR renames Host to ProcMacro, and records *all* proc macro dependencies produced by cargo in bootstrap builds. So even if you cross-compile from T1 to T2, and you build proc macros for both T1 and T2, we will now record also proc macros for T2 to be Host/ProcMacro dependencies. So they should be correctly filtered when assembling the toolchain. Kinda hard to tell if this won't break anything, but at least when cross-compiling compiler and library, the deps looked reasonable to me. Fixes: rust-lang#165478
…uwer Rollup of 23 pull requests Successful merges: - #165928 (Replace most uses of `type_array` with `type_byte_array` in `rustc_codegen_llvm`) - #160618 (require a consistent codegen backend when -Zllvm-target-feature is present) - #161950 (Ensure floats are returned losslessly by the C ABI on 32-bit x86) - #162267 (Fix an edge within `std::fs::create_dir_all` for certain platforms that views trailing cur dir components as a separate missing directory components) - #164043 (alloc: Unstably add `Vec::repeat` and `Vec::repeat_in`) - #164808 (asm const ptr: move name generation to asm-specific logic) - #164823 (Use `DerefMut` and `IndexMut` before `&raw mut` autoborrow) - #165568 (rustdoc: Suggest corrections for reference label typos) - #165641 (Treat all proc macro dependencies as host dependencies in bootstrap) - #165924 (rustc_codegen_gcc subtree update 2026-11-13) - #165927 (Remove `const_struct` from `rustc_codegen_ssa`) - #163696 (Stabilize `int_from_ascii`) - #163882 (docs(vec): clarify into_boxed_slice allocation guarantee) - #164362 (Emit note for `non_exhaustive` within defining crate for `unreachable_patterns`) - #164465 (Under `guard_patterns` allow parenthesized guarded patterns in match arms) - #164997 (Fix as str suggestion in subpattern) - #165825 (make `Complex<x87_f80>` ABI-compatible with C) - #165868 (Small changes to dyn compatibility) - #165879 (Add `#[rustc_test_entrypoint_marker]` back !) - #165902 (Add allocator() to vec_deque::IntoIter and vec_deque::Drain) - #165903 (Fix borrowck ICE when a borrow outlives a local in a const block) - #165914 (Use `trim_prefix` in bootstrap) - #165919 (tests: accept better behavior on underaligned accesses) Failed merges: - #165893 (Prune un/under used methods of `ast::Attribute`)
…uwer Rollup of 23 pull requests Successful merges: - #165928 (Replace most uses of `type_array` with `type_byte_array` in `rustc_codegen_llvm`) - #160618 (require a consistent codegen backend when -Zllvm-target-feature is present) - #161950 (Ensure floats are returned losslessly by the C ABI on 32-bit x86) - #162267 (Fix an edge within `std::fs::create_dir_all` for certain platforms that views trailing cur dir components as a separate missing directory components) - #164043 (alloc: Unstably add `Vec::repeat` and `Vec::repeat_in`) - #164808 (asm const ptr: move name generation to asm-specific logic) - #164823 (Use `DerefMut` and `IndexMut` before `&raw mut` autoborrow) - #165568 (rustdoc: Suggest corrections for reference label typos) - #165641 (Treat all proc macro dependencies as host dependencies in bootstrap) - #165924 (rustc_codegen_gcc subtree update 2026-11-13) - #165927 (Remove `const_struct` from `rustc_codegen_ssa`) - #163696 (Stabilize `int_from_ascii`) - #163882 (docs(vec): clarify into_boxed_slice allocation guarantee) - #164362 (Emit note for `non_exhaustive` within defining crate for `unreachable_patterns`) - #164465 (Under `guard_patterns` allow parenthesized guarded patterns in match arms) - #164997 (Fix as str suggestion in subpattern) - #165825 (make `Complex<x87_f80>` ABI-compatible with C) - #165868 (Small changes to dyn compatibility) - #165879 (Add `#[rustc_test_entrypoint_marker]` back !) - #165902 (Add allocator() to vec_deque::IntoIter and vec_deque::Drain) - #165903 (Fix borrowck ICE when a borrow outlives a local in a const block) - #165914 (Use `trim_prefix` in bootstrap) - #165919 (tests: accept better behavior on underaligned accesses) Failed merges: - #165893 (Prune un/under used methods of `ast::Attribute`)
Rollup merge of #165641 - Kobzol:proc-macros-deps, r=jieyouxu Treat all proc macro dependencies as host dependencies in bootstrap I think that the name `Host` was not fully accurate, and we were only adding proc macros as Host deps anyway. This PR renames Host to ProcMacro, and records *all* proc macro dependencies produced by cargo in bootstrap builds. So even if you cross-compile from T1 to T2, and you build proc macros for both T1 and T2, we will now record also proc macros for T2 to be Host/ProcMacro dependencies. So they should be correctly filtered when assembling the toolchain. Kinda hard to tell if this won't break anything, but at least when cross-compiling compiler and library, the deps looked reasonable to me. Fixes: #165478
|
Note This PR was benchmarked as part of triage of its containing rollup: triage URL. Finished benchmarking commit (7aeb102): comparison URL. Overall result: ❌ regressions - please read:Our benchmarks found a performance regression caused by this PR. Next Steps:
@rustbot label: +perf-regression Instruction countOur most reliable metric. Used to determine the overall result above. However, even this metric can be noisy.
Max RSS (memory usage)This perf run didn't have relevant results for this metric. CyclesThis perf run didn't have relevant results for this metric. Binary sizeThis perf run didn't have relevant results for this metric. Artifact size: 406.16 MiB -> 406.17 MiB (0.00%) |
|
Looks like include-blob noise for many of the members of the rollup |
Yeah, I think we should change to dynamic LLVM everywhere we can. |
…uwer Rollup of 23 pull requests Successful merges: - rust-lang/rust#165928 (Replace most uses of `type_array` with `type_byte_array` in `rustc_codegen_llvm`) - rust-lang/rust#160618 (require a consistent codegen backend when -Zllvm-target-feature is present) - rust-lang/rust#161950 (Ensure floats are returned losslessly by the C ABI on 32-bit x86) - rust-lang/rust#162267 (Fix an edge within `std::fs::create_dir_all` for certain platforms that views trailing cur dir components as a separate missing directory components) - rust-lang/rust#164043 (alloc: Unstably add `Vec::repeat` and `Vec::repeat_in`) - rust-lang/rust#164808 (asm const ptr: move name generation to asm-specific logic) - rust-lang/rust#164823 (Use `DerefMut` and `IndexMut` before `&raw mut` autoborrow) - rust-lang/rust#165568 (rustdoc: Suggest corrections for reference label typos) - rust-lang/rust#165641 (Treat all proc macro dependencies as host dependencies in bootstrap) - rust-lang/rust#165924 (rustc_codegen_gcc subtree update 2026-11-13) - rust-lang/rust#165927 (Remove `const_struct` from `rustc_codegen_ssa`) - rust-lang/rust#163696 (Stabilize `int_from_ascii`) - rust-lang/rust#163882 (docs(vec): clarify into_boxed_slice allocation guarantee) - rust-lang/rust#164362 (Emit note for `non_exhaustive` within defining crate for `unreachable_patterns`) - rust-lang/rust#164465 (Under `guard_patterns` allow parenthesized guarded patterns in match arms) - rust-lang/rust#164997 (Fix as str suggestion in subpattern) - rust-lang/rust#165825 (make `Complex<x87_f80>` ABI-compatible with C) - rust-lang/rust#165868 (Small changes to dyn compatibility) - rust-lang/rust#165879 (Add `#[rustc_test_entrypoint_marker]` back !) - rust-lang/rust#165902 (Add allocator() to vec_deque::IntoIter and vec_deque::Drain) - rust-lang/rust#165903 (Fix borrowck ICE when a borrow outlives a local in a const block) - rust-lang/rust#165914 (Use `trim_prefix` in bootstrap) - rust-lang/rust#165919 (tests: accept better behavior on underaligned accesses) Failed merges: - rust-lang/rust#165893 (Prune un/under used methods of `ast::Attribute`)
View all comments
I think that the name
Hostwas not fully accurate, and we were only adding proc macros as Host deps anyway. This PR renames Host to ProcMacro, and records all proc macro dependencies produced by cargo in bootstrap builds. So even if you cross-compile from T1 to T2, and you build proc macros for both T1 and T2, we will now record also proc macros for T2 to be Host/ProcMacro dependencies. So they should be correctly filtered when assembling the toolchain.Kinda hard to tell if this won't break anything, but at least when cross-compiling compiler and library, the deps looked reasonable to me.
Fixes: #165478