[Feature](INF-2296) infra: fix sccache bug for dwo file generate

mozilla · Sep 30, 2024 · 8d3296f · 8d3296f
1 parent 29d17c7
commit 8d3296f
Show file tree

Hide file tree

Showing 10 changed files with 5,435 additions and 1 deletion.
diff --git a/log/log.txt b/log/log.txt
diff --git a/o1/test.dwo b/o1/test.dwo
diff --git a/o1/test.o b/o1/test.o
diff --git a/o2/test.dwo b/o2/test.dwo
diff --git a/o2/test.o b/o2/test.o
diff --git a/o3/test.dwo b/o3/test.dwo
diff --git a/o3/test.o b/o3/test.o
diff --git a/src/compiler/c.rs b/src/compiler/c.rs
@@ -558,6 +558,11 @@ where
         // use in creating a hash key
         let mut common_and_arch_args = parsed_args.common_args.clone();
         common_and_arch_args.extend(parsed_args.arch_args.to_vec());
+        debug!(
+            "[{}]: common_and_arch_args: {:?}",
+            parsed_args.output_pretty(),
+            common_and_arch_args
+        );
 
         let key = {
             hash_key(

diff --git a/src/compiler/gcc.rs b/src/compiler/gcc.rs
@@ -575,6 +575,7 @@ where
     };
     if split_dwarf {
         let dwo = output.with_extension("dwo");
+        common_args.push(OsString::from("-D_gsplit_dwarf_path=".to_owned() + dwo.to_str().unwrap()));
         // -gsplit-dwarf doesn't guarantee .dwo file if no -g is specified
         outputs.insert(
             "dwo",
@@ -1075,6 +1076,12 @@ mod test {
             CompilerArguments::Ok(args) => args,
             o => panic!("Got unexpected parse result: {:?}", o),
         };
+        let mut common_and_arch_args = common_args.clone();
+        common_and_arch_args.extend(common_args.to_vec());
+        debug!(
+            "common_and_arch_args: {:?}",
+            common_and_arch_args
+        );
         assert_eq!(Some("foo.cpp"), input.to_str());
         assert_eq!(Language::Cxx, language);
         assert_map_contains!(
@@ -1095,7 +1102,9 @@ mod test {
             )
         );
         assert!(preprocessor_args.is_empty());
-        assert_eq!(ovec!["-gsplit-dwarf"], common_args);
+        assert!(common_args.contains(&"-gsplit-dwarf".into())
+            && common_args.contains(&"-D_gsplit_dwarf_path=foo.dwo".into())
+        );
         assert!(!msvc_show_includes);
     }
 

diff --git a/test.cc b/test.cc
@@ -0,0 +1 @@
+int test(){}