wip

Author: estebank

Cargo.lock

@@ -3976,6 +3976,7 @@ dependencies = [
  "rustc_target",
  "serde_json",
  "tracing",
+ "urlqstring",
  "winapi",
 ]
 
@@ -6090,6 +6091,12 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "urlqstring"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "25ef3473a06a065718d8ec7cd7acc6a35fc20f836dee7661ad3b64ea3cc2e0cc"
+
 [[package]]
 name = "utf-8"
 version = "0.7.5"

compiler/rustc_driver/Cargo.toml

@@ -10,6 +10,7 @@ crate-type = ["dylib"]
 backtrace = "0.3.66"
 serde_json = "1.0.59"
 chrono = "0.2"
+urlqstring = "*"
 tracing = { version = "0.1.35" }
 rustc_log = { path = "../rustc_log" }
 rustc_middle = { path = "../rustc_middle" }

compiler/rustc_driver/src/lib.rs

@@ -9,6 +9,7 @@
 #![feature(once_cell)]
 #![feature(decl_macro)]
 #![feature(panic_info_message)]
+#![feature(backtrace_frames)]
 #![recursion_limit = "256"]
 #![allow(rustc::potential_query_instability)]
 #![deny(rustc::untranslatable_diagnostic)]
@@ -1192,7 +1193,8 @@ impl From<std::io::Error> for IceError {
     }
 }
 
-fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<String, IceError> {
+fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<(String, String), IceError> {
+    let mut args = vec![];
     let capture = backtrace::Backtrace::force_capture();
     let now = chrono::UTC::now();
     let file_now = now.format("%Y-%m-%d_%H:%M:%S");
@@ -1210,17 +1212,21 @@ fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<String, IceError> {
         },
         config::host_triple(),
     )?;
+    args.push(("version", util::version_str!().unwrap_or("unknown_version")));
+    args.push(("platform", config::host_triple()));
 
     if let Some((flags, excluded_cargo_defaults)) = extra_compiler_flags() {
         writeln!(file, "compiler flags:")?;
-        for flag in flags {
+        for flag in &flags {
             writeln!(file, "    {flag}")?;
         }
         if excluded_cargo_defaults {
             writeln!(file, "some of the compiler flags provided by cargo are hidden")?;
         }
     }
     writeln!(file, "")?;
+    let mut text = String::new();
+    text.push_str(&format!("{:?} {:?}", info.message(), info.location()));
     match (info.message(), info.location()) {
         (Some(message), Some(location)) => {
             writeln!(file, "panicked at {location}:\n{message}")?;
@@ -1237,7 +1243,15 @@ fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<String, IceError> {
     }
 
     writeln!(file, "")?;
-    writeln!(file, "{}", capture)?;
+    let capture = capture.frames().iter().map(|frame| {
+        format!("{:?}", frame)
+    }).collect::<String>();
+    writeln!(file, "{capture}")?;
+    text.push_str(&format!("{capture}"));
+    args.push(("backtrace", &text));
+
+    println!("{}", text);
+    println!("{}", urlqstring::QueryParams::from(args).stringify());
 
     // Be careful relying on global state here: this code is called from
     // a panic hook, which means that the global `Handler` may be in a weird
@@ -1266,7 +1280,7 @@ fn write_ice_to_disk(info: &panic::PanicInfo<'_>) -> Result<String, IceError> {
         writeln!(file, "end of query stack")?;
         Ok(())
     })?;
-    Ok(path)
+    Ok((path, String::new()))
 }
 
 static DEFAULT_HOOK: LazyLock<Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send + 'static>> =
@@ -1313,7 +1327,7 @@ static DEFAULT_HOOK: LazyLock<Box<dyn Fn(&panic::PanicInfo<'_>) + Sync + Send +
 ///
 /// When `install_ice_hook` is called, this function will be called as the panic
 /// hook.
-pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str, reported_ice: Option<String>) {
+pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str, reported_ice: Option<(String, String)>) {
     let fallback_bundle =
         rustc_errors::fallback_fluent_bundle(rustc_errors::DEFAULT_LOCALE_RESOURCES, false);
     let emitter = Box::new(rustc_errors::emitter::EmitterWriter::stderr(
@@ -1341,10 +1355,10 @@ pub fn report_ice(info: &panic::PanicInfo<'_>, bug_report_url: &str, reported_ic
         handler.emit_diagnostic(&mut d);
     }
 
-    let xs: Vec<Cow<'static, str>> = if let Some(path) = &reported_ice {
+    let xs: Vec<Cow<'static, str>> = if let Some((path, url)) = &reported_ice {
         vec![
             format!("all necessary context about this bug was written to `{path}`").into(),
-            format!("we would appreciate a bug report with this context at <{bug_report_url}>")
+            format!("we would appreciate a bug report with this context at <{url}>")
                 .into(),
         ]
     } else {