bootstrap: Don't apply -Ztls-model=initial-exec to deps of proc-macros

Author: clubby789

src/bootstrap/src/bin/rustc.rs

@@ -28,6 +28,9 @@ use shared_helpers::{
 #[path = "../utils/shared_helpers.rs"]
 mod shared_helpers;
 
+#[path = "../utils/proc_macro_deps.rs"]
+mod proc_macro_deps;
+
 fn main() {
     let orig_args = env::args_os().skip(1).collect::<Vec<_>>();
     let mut args = orig_args.clone();
@@ -167,7 +170,7 @@ fn main() {
         // issue https://github.com/rust-lang/rust/issues/100530
         if env::var("RUSTC_TLS_MODEL_INITIAL_EXEC").is_ok()
             && crate_type != Some("proc-macro")
-            && !matches!(crate_name, Some("proc_macro2" | "quote" | "syn" | "synstructure"))
+            && proc_macro_deps::CRATES.binary_search(&crate_name.unwrap_or_default()).is_err()
         {
             cmd.arg("-Ztls-model=initial-exec");
         }

src/bootstrap/src/utils/proc_macro_deps.rs

@@ -0,0 +1,154 @@
+/// Holds all direct and indirect dependencies of proc-macro crates in tree. See #134863
+
+pub static CRATES: &[&str] = &[
+    // tidy-alphabetical-start
+    "annotate-snippets",
+    "anstyle",
+    "autocfg",
+    "basic-toml",
+    "bitflags",
+    "block-buffer",
+    "bumpalo",
+    "byteorder",
+    "cfg-if",
+    "clap_derive",
+    "color-print-proc-macro",
+    "cpufeatures",
+    "crossbeam-channel",
+    "crossbeam-deque",
+    "crossbeam-epoch",
+    "crossbeam-utils",
+    "crypto-common",
+    "darling",
+    "darling_core",
+    "darling_macro",
+    "derive-where",
+    "derive_builder_core",
+    "derive_setters",
+    "digest",
+    "displaydoc",
+    "either",
+    "equivalent",
+    "fluent-bundle",
+    "fluent-langneg",
+    "fluent-syntax",
+    "fnv",
+    "foldhash",
+    "futf",
+    "futures-macro",
+    "generic-array",
+    "getrandom",
+    "hashbrown",
+    "heck",
+    "hermit-abi",
+    "html5ever",
+    "icu_provider_macros",
+    "ident_case",
+    "indexmap",
+    "intl-memoizer",
+    "intl_pluralrules",
+    "itoa",
+    "libc",
+    "lock_api",
+    "log",
+    "mac",
+    "markup5ever",
+    "memchr",
+    "mime",
+    "mime_guess",
+    "minimal-lexical",
+    "new_debug_unreachable",
+    "nom",
+    "num_cpus",
+    "once_cell",
+    "parking_lot",
+    "parking_lot_core",
+    "pest",
+    "pest_generator",
+    "pest_meta",
+    "phf",
+    "phf_codegen",
+    "phf_generator",
+    "phf_shared",
+    "ppv-lite86",
+    "precomputed-hash",
+    "proc-macro-hack",
+    "proc-macro2",
+    "quote",
+    "rand",
+    "rand_chacha",
+    "rand_core",
+    "rayon",
+    "rayon-core",
+    "redox_syscall",
+    "rinja_derive",
+    "rinja_parser",
+    "rustc-hash",
+    "rustc-rayon",
+    "rustc-rayon-core",
+    "rustc_fluent_macro",
+    "rustc_index_macros",
+    "rustc_macros",
+    "rustc_type_ir_macros",
+    "rustfmt-config_proc_macro",
+    "rustversion",
+    "ryu",
+    "scopeguard",
+    "self_cell",
+    "serde",
+    "serde_derive",
+    "serde_json",
+    "sha2",
+    "siphasher",
+    "smallvec",
+    "stable_deref_trait",
+    "string_cache",
+    "string_cache_codegen",
+    "strsim",
+    "strum_macros",
+    "syn",
+    "synstructure",
+    "tendril",
+    "thiserror",
+    "thiserror-impl",
+    "tinystr",
+    "tracing-attributes",
+    "type-map",
+    "typenum",
+    "ucd-trie",
+    "unic-langid",
+    "unic-langid-impl",
+    "unic-langid-macros",
+    "unic-langid-macros-impl",
+    "unicase",
+    "unicode-ident",
+    "unicode-width",
+    "utf-8",
+    "version_check",
+    "wasi",
+    "wasm-bindgen-backend",
+    "wasm-bindgen-macro-support",
+    "wasm-bindgen-shared",
+    "windows-bindgen",
+    "windows-implement",
+    "windows-interface",
+    "windows-metadata",
+    "windows-targets",
+    "windows_aarch64_gnullvm",
+    "windows_aarch64_msvc",
+    "windows_i686_gnu",
+    "windows_i686_gnullvm",
+    "windows_i686_msvc",
+    "windows_x86_64_gnu",
+    "windows_x86_64_gnullvm",
+    "windows_x86_64_msvc",
+    "yoke",
+    "yoke-derive",
+    "zerocopy",
+    "zerocopy-derive",
+    "zerofrom",
+    "zerofrom-derive",
+    "zerovec",
+    "zerovec-derive",
+    // tidy-alphabetical-end
+];