Commit 768dcbe

committed

add rust.break-on-ice to bootstrap.toml

1 parent 75ee9ff commit 768dcbeCopy full SHA for 768dcbe

File tree

+18

-2

lines changed

+18

-2

lines changed

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -856,6 +856,9 @@`
`856`	`856`	`# as libstd features, this option can also be used to configure features such as optimize_for_size.`
`857`	`857`	`#rust.std-features = ["panic_unwind"]`
`858`	`858`
	`859`	+# Trigger a `DebugBreak` after an internal compiler error during bootstrap on Windows
	`860`	`+#rust.break-on-ice = true`
	`861`	`+`
`859`	`862`	`# =============================================================================`
`860`	`863`	`# Distribution options`
`861`	`864`	`#`

Lines changed: 5 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -877,8 +877,11 @@ impl Builder<'_> {`
`877`	`877`	`.env("RUSTC_LIBDIR", libdir)`
`878`	`878`	`.env("RUSTDOC", self.bootstrap_out.join("rustdoc"))`
`879`	`879`	`.env("RUSTDOC_REAL", rustdoc_path)`
`880`		`- .env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir())`
`881`		`- .env("RUSTC_BREAK_ON_ICE", "1");`
	`880`	`+ .env("RUSTC_ERROR_METADATA_DST", self.extended_error_dir());`
	`881`	`+`
	`882`	`+ if self.config.rust_break_on_ice {`
	`883`	`+ cargo.env("RUSTC_BREAK_ON_ICE", "1");`
	`884`	`+ }`
`882`	`885`
`883`	`886`	`// Set RUSTC_WRAPPER to the bootstrap shim, which switches between beta and in-tree`
`884`	`887`	`// sysroot depending on whether we're building build scripts.`

Lines changed: 3 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -221,6 +221,7 @@ pub struct Config {`
`221`	`221`	`pub rust_lto: RustcLto,`
`222`	`222`	`pub rust_validate_mir_opts: Option<u32>,`
`223`	`223`	`pub rust_std_features: BTreeSet<String>,`
	`224`	`+ pub rust_break_on_ice: bool,`
`224`	`225`	`pub llvm_profile_use: Option<String>,`
`225`	`226`	`pub llvm_profile_generate: bool,`
`226`	`227`	`pub llvm_libunwind_default: Option<LlvmLibunwind>,`
`@@ -550,6 +551,7 @@ impl Config {`
`550`	`551`	`strip: rust_strip,`
`551`	`552`	`lld_mode: rust_lld_mode,`
`552`	`553`	`std_features: rust_std_features,`
	`554`	`+ break_on_ice: rust_break_on_ice,`
`553`	`555`	`} = toml.rust.unwrap_or_default();`
`554`	`556`
`555`	`557`	`let Llvm {`
`@@ -1269,6 +1271,7 @@ impl Config {`
`1269`	`1271`	`reproducible_artifacts: flags_reproducible_artifact,`
`1270`	`1272`	`reuse: build_reuse.map(PathBuf::from),`
`1271`	`1273`	`rust_analyzer_info,`
	`1274`	`+ rust_break_on_ice: rust_break_on_ice.unwrap_or(true),`
`1272`	`1275`	`rust_codegen_backends: rust_codegen_backends`
`1273`	`1276`	`.map(\|backends\| parse_codegen_backends(backends, "rust"))`
`1274`	`1277`	`.unwrap_or(vec![CodegenBackendKind::Llvm]),`

Lines changed: 2 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -65,6 +65,7 @@ define_config! {`
`65`	`65`	`lto: Option<String> = "lto",`
`66`	`66`	`validate_mir_opts: Option<u32> = "validate-mir-opts",`
`67`	`67`	`std_features: Option<BTreeSet<String>> = "std-features",`
	`68`	`+ break_on_ice: Option<bool> = "break-on-ice",`
`68`	`69`	`}`
`69`	`70`	`}`
`70`	`71`
`@@ -355,6 +356,7 @@ pub fn check_incompatible_options_for_ci_rustc(`
`355`	`356`	`download_rustc: _,`
`356`	`357`	`validate_mir_opts: _,`
`357`	`358`	`frame_pointers: _,`
	`359`	`+ break_on_ice: _,`
`358`	`360`	`} = ci_rust_config;`
`359`	`361`
`360`	`362`	`// There are two kinds of checks for CI rustc incompatible options:`

Lines changed: 5 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -536,4 +536,9 @@ pub const CONFIG_CHANGE_HISTORY: &[ChangeInfo] = &[`
`536`	`536`	`severity: ChangeSeverity::Warning,`
`537`	`537`	summary: "It is no longer possible to `x test` with stage 0, except for running compiletest and opting into `build.compiletest-allow-stage0`.",
`538`	`538`	`},`
	`539`	`+ ChangeInfo {`
	`540`	`+ change_id: 145976,`
	`541`	`+ severity: ChangeSeverity::Info,`
	`542`	+ summary: "Added a new option `rust.break-on-ice` to control if internal compiler errors cause a debug break on Windows.",
	`543`	`+ },`
`539`	`544`	`];`

Comments

(0)