From bc0de763659fec801a0a67e12db85289ce1945f4 Mon Sep 17 00:00:00 2001
From: Giordano Salvador <73959795+e3m3@users.noreply.github.com>
Date: Sat, 14 Sep 2024 01:52:38 -0400
Subject: [PATCH] Fix pass builder pass name for linux-aarch64

---
 src/target.rs                       | 2 +-
 tests/lit-llvm/codegen_type.calc    | 2 --
 tests/lit-llvm/end_to_end1.calc     | 1 -
 tests/lit-llvm/end_to_end2.calc     | 1 -
 tests/lit-llvm/input_file1.calc     | 1 -
 tests/lit-llvm/irgen1.calc          | 2 --
 tests/lit-llvm/irgen2.calc          | 2 --
 tests/lit-llvm/maingen1.calc        | 2 --
 tests/lit-llvm/maingen2.calc        | 2 --
 tests/lit-llvm/option_notarget.calc | 2 --
 tests/lit-llvm/option_opt.calc      | 2 --
 11 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/src/target.rs b/src/target.rs
index c59b55a..fc7af4d 100644
--- a/src/target.rs
+++ b/src/target.rs
@@ -164,7 +164,7 @@ impl PassBuilder {
         opt_level: OptLevel,
         no_target: bool,
     ) -> bool {
-        let passes: String = format!("default<{}>", opt_level_to_str(opt_level));
+        let passes: String = format!("default<{}>\0", opt_level_to_str(opt_level));
         unsafe {
             if !no_target {
                 LLVMSetModuleDataLayout(bundle.module, machine.data_layout);
diff --git a/tests/lit-llvm/codegen_type.calc b/tests/lit-llvm/codegen_type.calc
index 1533656..7b93b35 100644
--- a/tests/lit-llvm/codegen_type.calc
+++ b/tests/lit-llvm/codegen_type.calc
@@ -12,5 +12,3 @@
 // CHECK_B: Bytecode file type (missing '-S' flag) should match output name ('.bc' extension)
 
 // CHECK_C-NOT: ^0
-
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/end_to_end1.calc b/tests/lit-llvm/end_to_end1.calc
index ab804e8..744e583 100644
--- a/tests/lit-llvm/end_to_end1.calc
+++ b/tests/lit-llvm/end_to_end1.calc
@@ -7,4 +7,3 @@
 // CHECK:   calcc_main result: 4096
 
 // XFAIL: ARCH_AARCH64 && OS_MACOS
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/end_to_end2.calc b/tests/lit-llvm/end_to_end2.calc
index 99a5470..3cb350a 100644
--- a/tests/lit-llvm/end_to_end2.calc
+++ b/tests/lit-llvm/end_to_end2.calc
@@ -47,4 +47,3 @@
 // CHECK_F: calcc_main result: 0
 
 // XFAIL: ARCH_AARCH64 && OS_MACOS
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/input_file1.calc b/tests/lit-llvm/input_file1.calc
index 9013f24..cc174b1 100644
--- a/tests/lit-llvm/input_file1.calc
+++ b/tests/lit-llvm/input_file1.calc
@@ -11,4 +11,3 @@
 with: a,b,c: c*c - (a*a + b*b)
 
 // XFAIL: ARCH_AARCH64 && OS_MACOS
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/irgen1.calc b/tests/lit-llvm/irgen1.calc
index 13ee099..5a54f37 100644
--- a/tests/lit-llvm/irgen1.calc
+++ b/tests/lit-llvm/irgen1.calc
@@ -16,5 +16,3 @@
 // CHECK:         %v3 = add nsw i64 %v2, 10
 // CHECK:         ret i64 %v3
 // CHECK:       }
-
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/irgen2.calc b/tests/lit-llvm/irgen2.calc
index 10d90df..79e7148 100644
--- a/tests/lit-llvm/irgen2.calc
+++ b/tests/lit-llvm/irgen2.calc
@@ -11,5 +11,3 @@
 // CHECK-LABEL: entry:
 // CHECK:         ret i64 4096
 // CHECK:       }
-
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/maingen1.calc b/tests/lit-llvm/maingen1.calc
index 26d50ac..5f64b6c 100644
--- a/tests/lit-llvm/maingen1.calc
+++ b/tests/lit-llvm/maingen1.calc
@@ -74,5 +74,3 @@
 // CHECK:         %v3 = add nsw i64 %v2, 10
 // CHECK:         ret i64 %v3
 // CHECK:       }
-
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/maingen2.calc b/tests/lit-llvm/maingen2.calc
index 80c6889..2382db4 100644
--- a/tests/lit-llvm/maingen2.calc
+++ b/tests/lit-llvm/maingen2.calc
@@ -53,5 +53,3 @@
 // CHECK-LABEL: entry:
 // CHECK:         ret i64 4096
 // CHECK:       }
-
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/option_notarget.calc b/tests/lit-llvm/option_notarget.calc
index 2a2732e..4d72ae4 100644
--- a/tests/lit-llvm/option_notarget.calc
+++ b/tests/lit-llvm/option_notarget.calc
@@ -20,5 +20,3 @@
 // CHECK_NOTARGET-LABEL:    entry:
 // CHECK_NOTARGET:            ret i64 4096
 // CHECK_NOTARGET:          }
-
-// XFAIL: ARCH_AARCH64 && OS_LINUX
diff --git a/tests/lit-llvm/option_opt.calc b/tests/lit-llvm/option_opt.calc
index 8f1c85f..862491f 100644
--- a/tests/lit-llvm/option_opt.calc
+++ b/tests/lit-llvm/option_opt.calc
@@ -21,5 +21,3 @@
 // CHECK_O1:          %v[[REG:[0-9]+]] = shl nsw i64 %0, 5
 // CHECK_O1:          ret i64 %v[[REG]]
 // CHECK_O1:        }
-
-// XFAIL: ARCH_AARCH64 && OS_LINUX