catch measureme panics and log errors

Author: lqd

collector/src/compile/execute/mod.rs

@@ -636,12 +636,27 @@ fn parse_self_profile(
     let (profile, files) = if let Some(profile_path) = full_path {
         // measureme 0.8+ uses a single file
         let data = fs::read(&profile_path)?;
-        let results = analyzeme::ProfilingData::from_paged_buffer(data, None)
-            .map_err(|error| {
-                eprintln!("Cannot read self-profile data: {error:?}");
-                std::io::Error::new(ErrorKind::InvalidData, error)
-            })?
-            .perform_analysis();
+
+        // HACK: `decodeme` can unexpectedly panic on invalid data produced by rustc. We catch this
+        // here until it's fixed and emits a proper error.
+        let res =
+            std::panic::catch_unwind(|| analyzeme::ProfilingData::from_paged_buffer(data, None));
+        let results = match res {
+            Ok(Ok(profiling_data)) => profiling_data.perform_analysis(),
+            Ok(Err(error)) => {
+                // A "regular" error in measureme.
+                log::error!("Cannot read self-profile data: {error:?}");
+                return Err(std::io::Error::new(ErrorKind::InvalidData, error));
+            }
+            Err(error) => {
+                // An unexpected panic in measureme: it sometimes happens when encountering some
+                // cases of invalid mm_profdata files.
+                let error = format!("Unexpected measureme error with self-profile data: {error:?}");
+                log::error!("{error}");
+                return Err(std::io::Error::new(ErrorKind::InvalidData, error));
+            }
+        };
+
         let profile = SelfProfile {
             artifact_sizes: results.artifact_sizes,
         };