From a793680b74961801046e2050211a06ad6397df6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= Date: Wed, 10 May 2023 11:34:57 +0200 Subject: [PATCH 1/2] cargo clippy. --- src/elf.rs | 4 ++-- src/static_analysis.rs | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/elf.rs b/src/elf.rs index cce1ce85..81efd01d 100644 --- a/src/elf.rs +++ b/src/elf.rs @@ -400,7 +400,7 @@ impl Executable { 0 }; Ok(Self { - _verifier: PhantomData::default(), + _verifier: PhantomData, elf_bytes, ro_section: Section::Borrowed(0, 0..text_bytes.len()), text_section_info: SectionInfo { @@ -515,7 +515,7 @@ impl Executable { )?; Ok(Self { - _verifier: PhantomData::default(), + _verifier: PhantomData, elf_bytes, ro_section, text_section_info, diff --git a/src/static_analysis.rs b/src/static_analysis.rs index d713f347..464c0f5b 100644 --- a/src/static_analysis.rs +++ b/src/static_analysis.rs @@ -896,7 +896,7 @@ impl<'a> Analysis<'a> { }; } if cfg_node.dominator_parent != dominator_parent { - let mut cfg_node = self.cfg_nodes.get_mut(b).unwrap(); + let cfg_node = self.cfg_nodes.get_mut(b).unwrap(); cfg_node.dominator_parent = dominator_parent; terminate = false; } From be9c8d70b37fb2ab022b74c3a73c9e72289af21f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Mei=C3=9Fner?= Date: Wed, 10 May 2023 11:59:53 +0200 Subject: [PATCH 2/2] Removes test_size. --- src/elf.rs | 16 ---------------- 1 file changed, 16 deletions(-) diff --git a/src/elf.rs b/src/elf.rs index 81efd01d..defbbcb4 100644 --- a/src/elf.rs +++ b/src/elf.rs @@ -2141,20 +2141,4 @@ mod test { .expect("failed to read elf file"); ElfExecutable::load(&elf_bytes, loader()).expect("validation failed"); } - - #[cfg(all(feature = "jit", not(target_os = "windows"), target_arch = "x86_64"))] - #[test] - fn test_size() { - let mut file = File::open("tests/elfs/noop.so").expect("file open failed"); - let mut elf_bytes = Vec::new(); - file.read_to_end(&mut elf_bytes) - .expect("failed to read elf file"); - let mut executable = - ElfExecutable::from_elf(&elf_bytes, loader()).expect("validation failed"); - { - Executable::jit_compile(&mut executable).unwrap(); - } - - assert_eq!(10546, executable.mem_size()); - } }