WIP object reading

Author: gilescope

Cargo.toml

@@ -77,6 +77,11 @@ im-rc = "15.0.0"
 # for more information.
 rustc-workspace-hack = "1.0.0"
 
+[dependencies.object]
+version = "0.20.0"
+default-features = false
+features = ['read_core', 'elf', 'macho', 'pe', 'unaligned']
+
 [target.'cfg(target_os = "macos")'.dependencies]
 core-foundation = { version = "0.9.0", features = ["mac_os_10_7_support"] }
 

src/cargo/core/compiler/fingerprint.rs

@@ -1824,6 +1824,16 @@ fn find_stale_file(
                         }
                         format!("{:?}", hasher.result())
                     }
+                    FileHashAlgorithm::SvhInBin => {
+                        debug!("found! got here");
+                        use object::Object;
+                        let v : Vec<u8> = vec![];
+                        let obj = object::read::File::parse(&v).unwrap();
+                        for sym in obj.symbols() {
+                            println!("{:#?}", sym);
+                        }
+                        "todo!".to_string()
+                    }
                     FileHashAlgorithm::Filename => {
                         "0".to_string()
                     }
@@ -1859,6 +1869,7 @@ fn find_stale_file(
 #[derive(Clone, Copy, Eq, PartialEq)]
 pub enum FileHashAlgorithm {
     Md5,
+    SvhInBin,
     Sha1,
     /// If the hash is in the filename then as long as the file exists we can
     /// assume it is up to date.
@@ -1871,6 +1882,7 @@ impl FromStr for FileHashAlgorithm {
     fn from_str(s: &str) -> Result<FileHashAlgorithm, ()> {
         match s {
             "md5" => Ok(FileHashAlgorithm::Md5),
+            "svh_in_bin" => Ok(FileHashAlgorithm::SvhInBin),
             "sha1" => Ok(FileHashAlgorithm::Sha1),
             "hash_in_filename" => Ok(FileHashAlgorithm::Filename),
             _ => Err(()),
@@ -2025,6 +2037,7 @@ impl EncodedDepInfo {
                 0 => FileHashAlgorithm::Md5,
                 1 => FileHashAlgorithm::Sha1,
                 2 => FileHashAlgorithm::Filename,
+                3 => FileHashAlgorithm::SvhInBin,
                 _ => return None,
             };
             let ty = match read_u8(bytes)? {
@@ -2108,6 +2121,7 @@ impl EncodedDepInfo {
                 FileHashAlgorithm::Md5 => dst.push(0),
                 FileHashAlgorithm::Sha1 => dst.push(1),
                 FileHashAlgorithm::Filename => dst.push(2),
+                FileHashAlgorithm::SvhInBin => dst.push(3),
             }
             match ty {
                 DepInfoPathType::PackageRootRelative => dst.push(0),

src/cargo/core/compiler/mod.rs

@@ -860,6 +860,7 @@ fn build_base_args(
 
     match cx.files().metadata(unit) {
         Some(m) => {
+            println!("extra filename called {}", m);
             cmd.arg("-C").arg(&format!("metadata={}", m));
             cmd.arg("-C").arg(&format!("extra-filename=-{}", m));
         }

tests/testsuite/tool_paths.rs

@@ -32,6 +32,30 @@ fn pathless_tools() {
         .run();
 }
 
+#[cargo_test]
+fn obj_test() {
+    use object::Object;
+    use object::ObjectSegment;
+    use std::io::Read;
+    use std::fs::File;
+    
+//    let mut file = File::open("/Users/gilescope/projects/tst/target/debug/deps/libmydep2-244330a37db7aca2.rlib").unwrap();
+    let mut file = File::open("/Users/gilescope/projects/tst/target/debug/deps/tst").unwrap();
+
+    let mut data = Vec::new();
+    file.read_to_end(&mut data).unwrap();
+    let obj = object::read::File::parse(&data).unwrap();
+    for sym in obj.symbols() {
+        println!("{:#?}", sym);
+    }
+    for seg in obj.segments() {//will be in __DATA seg for mach-o
+        if let Ok(Some("__DATA")) = seg.name()
+        {
+                println!("{:#?}", seg);
+        }
+    }
+}
+
 #[cargo_test]
 fn absolute_tools() {
     let target = rustc_host();