Strip unnecessary info from expected assembly output

Author: madsmtm

tests/assembly/test_msg_send_zero_cost/expected/aarch64-apple-darwin.s

@@ -1,10 +1,7 @@
 	.section	__TEXT,__text,regular,pure_instructions
-	.build_version macos, 11, 0
 	.globl	_handle
 	.p2align	2
 _handle:
-	.cfi_startproc
 	b	_objc_msgSend
-	.cfi_endproc
 
 .subsections_via_symbols

tests/assembly/test_msg_send_zero_cost/expected/aarch64-apple-ios-sim.s

@@ -1,20 +1,11 @@
 	.section	__TEXT,__text,regular,pure_instructions
-	.build_version iossimulator, 14, 0
 	.globl	_handle
 	.p2align	2
 _handle:
-	.cfi_startproc
 	b	_objc_msgSend
-	.cfi_endproc
 
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
+; Stripped __LLVM section
 
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
+; Stripped __LLVM section
 
 .subsections_via_symbols

tests/assembly/test_msg_send_zero_cost/expected/aarch64-apple-ios.s

@@ -1,20 +1,11 @@
 	.section	__TEXT,__text,regular,pure_instructions
-	.ios_version_min 7, 0
 	.globl	_handle
 	.p2align	2
 _handle:
-	.cfi_startproc
 	b	_objc_msgSend
-	.cfi_endproc
 
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
+; Stripped __LLVM section
 
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
-; Stripped __LLVM line
+; Stripped __LLVM section
 
 .subsections_via_symbols

tests/assembly/test_msg_send_zero_cost/expected/i386-apple-ios.s

@@ -1,17 +1,11 @@
 	.section	__TEXT,__text,regular,pure_instructions
-	.ios_version_min 7, 0
 	.intel_syntax noprefix
 	.globl	_handle
 	.p2align	4, 0x90
 _handle:
-	.cfi_startproc
 	push	ebp
-	.cfi_def_cfa_offset 8
-	.cfi_offset ebp, -8
 	mov	ebp, esp
-	.cfi_def_cfa_register ebp
 	pop	ebp
 	jmp	_objc_msgSend
-	.cfi_endproc
 
 .subsections_via_symbols

tests/assembly/test_msg_send_zero_cost/expected/i686-apple-darwin.s

@@ -1,17 +1,11 @@
 	.section	__TEXT,__text,regular,pure_instructions
-	.macosx_version_min 10, 7
 	.intel_syntax noprefix
 	.globl	_handle
 	.p2align	4, 0x90
 _handle:
-	.cfi_startproc
 	push	ebp
-	.cfi_def_cfa_offset 8
-	.cfi_offset ebp, -8
 	mov	ebp, esp
-	.cfi_def_cfa_register ebp
 	pop	ebp
 	jmp	_objc_msgSend
-	.cfi_endproc
 
 .subsections_via_symbols

tests/assembly/test_msg_send_zero_cost/expected/x86_64-apple-darwin.s

@@ -1,17 +1,11 @@
 	.section	__TEXT,__text,regular,pure_instructions
-	.macosx_version_min 10, 7
 	.intel_syntax noprefix
 	.globl	_handle
 	.p2align	4, 0x90
 _handle:
-	.cfi_startproc
 	push	rbp
-	.cfi_def_cfa_offset 16
-	.cfi_offset rbp, -16
 	mov	rbp, rsp
-	.cfi_def_cfa_register rbp
 	pop	rbp
 	jmp	_objc_msgSend
-	.cfi_endproc
 
 .subsections_via_symbols

tests/assembly/test_msg_send_zero_cost/expected/x86_64-apple-ios.s

@@ -1,17 +1,11 @@
 	.section	__TEXT,__text,regular,pure_instructions
-	.ios_version_min 7, 0
 	.intel_syntax noprefix
 	.globl	_handle
 	.p2align	4, 0x90
 _handle:
-	.cfi_startproc
 	push	rbp
-	.cfi_def_cfa_offset 16
-	.cfi_offset rbp, -16
 	mov	rbp, rsp
-	.cfi_def_cfa_register rbp
 	pop	rbp
 	jmp	_objc_msgSend
-	.cfi_endproc
 
 .subsections_via_symbols

tests/src/bin/test_assembly.rs

@@ -11,6 +11,13 @@ use std::io;
 use std::path::Path;
 use std::process::{Command, Stdio};
 
+fn strip_lines(data: &str, starts_with: &str) -> String {
+    data.lines()
+        .filter(|line| !line.trim_start().starts_with(starts_with))
+        .collect::<Vec<_>>()
+        .join("\n")
+}
+
 fn strip_section(data: &str, section: &str) -> String {
     let mut res = String::with_capacity(data.len());
     let mut in_removed_section = false;
@@ -20,14 +27,17 @@ fn strip_section(data: &str, section: &str) -> String {
             in_removed_section = false;
         }
         if line.trim().starts_with(".section") {
-            in_removed_section = line.contains(section);
+            if line.contains(section) {
+                in_removed_section = true;
+                write!(res, "; Stripped {section} section\n").unwrap();
+            } else {
+                in_removed_section = false;
+            }
         }
         if !in_removed_section {
             res.push_str(line);
-        } else {
-            write!(res, "; Stripped {section} line").unwrap();
+            res.push('\n');
         }
-        res.push('\n');
     }
     res
 }
@@ -41,6 +51,10 @@ fn read_assembly<P: AsRef<Path>>(path: P) -> io::Result<String> {
         .to_str()
         .unwrap();
     let s = s.replace(workspace_dir, "$WORKSPACE");
+    let s = strip_lines(&s, ".cfi_");
+    let s = strip_lines(&s, ".macosx_version_");
+    let s = strip_lines(&s, ".ios_version_");
+    let s = strip_lines(&s, ".build_version");
     // We remove the __LLVM,__bitcode and __LLVM,__cmdline sections because
     // they're uninteresting for out use-case.
     //