From 3a66101cd22938459b766694d3af6a211de51095 Mon Sep 17 00:00:00 2001
From: caballa <navasjorgea@gmail.com>
Date: Tue, 12 Sep 2023 21:50:53 -0600
Subject: [PATCH] tests: udpated bitcode to LLVM 14

---
 tests/complete_callgraph_1.ll   |  31 +++--
 tests/complete_callgraph_10.ll  |  65 +++++----
 tests/complete_callgraph_11.ll  |  67 +++++----
 tests/complete_callgraph_12.ll  |  76 ++++++-----
 tests/complete_callgraph_13.ll  |  48 ++++---
 tests/complete_callgraph_13b.ll |  46 ++++---
 tests/complete_callgraph_14.ll  |  46 ++++---
 tests/complete_callgraph_15.ll  |  56 ++++----
 tests/complete_callgraph_16.ll  | 182 ++++++++++++-------------
 tests/complete_callgraph_17.ll  | 233 +++++++++++++++++++-------------
 tests/complete_callgraph_2.ll   |  41 +++---
 tests/complete_callgraph_3.ll   |  41 +++---
 tests/complete_callgraph_4.ll   |  56 ++++----
 tests/complete_callgraph_5.ll   |  42 +++---
 tests/complete_callgraph_6.ll   |  33 +++--
 tests/complete_callgraph_7.ll   |  58 ++++----
 tests/complete_callgraph_8.ll   |  41 +++---
 tests/complete_callgraph_9.ll   |  42 +++---
 tests/issue93_alias.ll          |  71 +++++-----
 tests/issue97.ll                |  79 ++++++-----
 20 files changed, 749 insertions(+), 605 deletions(-)

diff --git a/tests/complete_callgraph_1.ll b/tests/complete_callgraph_1.ll
index 334127f4..4c3536b4 100644
--- a/tests/complete_callgraph_1.ll
+++ b/tests/complete_callgraph_1.ll
@@ -2,13 +2,13 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_1.dot %T/complete_callgraph_1.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_1.bc'
+; ModuleID = 'complete_callgraph_1.c'
 source_filename = "complete_callgraph_1.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @add(i32, i32) #0 {
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -20,7 +20,7 @@ define i32 @add(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @sub(i32, i32) #0 {
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -32,7 +32,7 @@ define i32 @sub(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @use(i32 (i32, i32)*) #0 {
+define i32 @use(i32 (i32, i32)* %0) #0 {
   %2 = alloca i32 (i32, i32)*, align 8
   %3 = alloca i32, align 4
   store i32 (i32, i32)* %0, i32 (i32, i32)** %2, align 8
@@ -59,11 +59,18 @@ define i32 @main() #0 {
   ret i32 %8
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_10.ll b/tests/complete_callgraph_10.ll
index 7a642663..aa3e25bc 100644
--- a/tests/complete_callgraph_10.ll
+++ b/tests/complete_callgraph_10.ll
@@ -2,15 +2,15 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_10.dot %T/complete_callgraph_10.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_10.bc'
-source_filename = "../tests/c/complete_callgraph_10.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+; ModuleID = 'complete_callgraph_10.c'
+source_filename = "complete_callgraph_10.c"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
-@arith_functions = global [4 x i32 (i32, i32)*] [i32 (i32, i32)* @add, i32 (i32, i32)* @sub, i32 (i32, i32)* @mul, i32 (i32, i32)* @div], align 16
+@arith_functions = global [4 x i32 (i32, i32)*] [i32 (i32, i32)* @add, i32 (i32, i32)* @sub, i32 (i32, i32)* @mul, i32 (i32, i32)* @div], align 8
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @add(i32, i32) #0 {
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -22,7 +22,7 @@ define i32 @add(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @sub(i32, i32) #0 {
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -34,7 +34,7 @@ define i32 @sub(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @mul(i32, i32) #0 {
+define i32 @mul(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -46,7 +46,7 @@ define i32 @mul(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @div(i32, i32) #0 {
+define i32 @div(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -65,11 +65,11 @@ define i32 @main() #0 {
   %4 = alloca i32, align 4
   store i32 0, i32* %1, align 4
   store i32 0, i32* %2, align 4
-  %5 = call i32 (...) @nd_uint()
+  %5 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   store i32 %5, i32* %3, align 4
-  %6 = call i32 (...) @nd_uint()
+  %6 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   store i32 %6, i32* %4, align 4
-  %7 = call i32 (...) @nd_uint()
+  %7 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   switch i32 %7, label %28 [
     i32 0, label %8
     i32 1, label %13
@@ -77,15 +77,15 @@ define i32 @main() #0 {
     i32 3, label %23
   ]
 
-; <label>:8:                                      ; preds = %0
-  %9 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 0), align 16
+8:                                                ; preds = %0
+  %9 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 0), align 8
   %10 = load i32, i32* %3, align 4
   %11 = load i32, i32* %4, align 4
   %12 = call i32 %9(i32 %10, i32 %11)
   store i32 %12, i32* %2, align 4
   br label %29
 
-; <label>:13:                                     ; preds = %0
+13:                                               ; preds = %0
   %14 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 1), align 8
   %15 = load i32, i32* %3, align 4
   %16 = load i32, i32* %4, align 4
@@ -93,15 +93,15 @@ define i32 @main() #0 {
   store i32 %17, i32* %2, align 4
   br label %29
 
-; <label>:18:                                     ; preds = %0
-  %19 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 2), align 16
+18:                                               ; preds = %0
+  %19 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 2), align 8
   %20 = load i32, i32* %3, align 4
   %21 = load i32, i32* %4, align 4
   %22 = call i32 %19(i32 %20, i32 %21)
   store i32 %22, i32* %2, align 4
   br label %29
 
-; <label>:23:                                     ; preds = %0
+23:                                               ; preds = %0
   %24 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 3), align 8
   %25 = load i32, i32* %3, align 4
   %26 = load i32, i32* %4, align 4
@@ -109,22 +109,29 @@ define i32 @main() #0 {
   store i32 %27, i32* %2, align 4
   br label %29
 
-; <label>:28:                                     ; preds = %0
+28:                                               ; preds = %0
   br label %29
 
-; <label>:29:                                     ; preds = %28, %23, %18, %13, %8
+29:                                               ; preds = %28, %23, %18, %13, %8
   %30 = load i32, i32* %2, align 4
   ret i32 %30
 }
 
 declare i32 @nd_uint(...) #1
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_11.ll b/tests/complete_callgraph_11.ll
index 05c03231..bd6d95bd 100644
--- a/tests/complete_callgraph_11.ll
+++ b/tests/complete_callgraph_11.ll
@@ -2,15 +2,15 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_11.dot %T/complete_callgraph_11.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_11.bc'
+; ModuleID = 'complete_callgraph_11.c'
 source_filename = "complete_callgraph_11.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
-@arith_functions = common global [4 x i32 (i32, i32)*] zeroinitializer, align 16
+@arith_functions = common global [4 x i32 (i32, i32)*] zeroinitializer, align 8
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @add(i32, i32) #0 {
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -22,7 +22,7 @@ define i32 @add(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @sub(i32, i32) #0 {
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -34,7 +34,7 @@ define i32 @sub(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @mul(i32, i32) #0 {
+define i32 @mul(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -46,7 +46,7 @@ define i32 @mul(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @div(i32, i32) #0 {
+define i32 @div(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -64,16 +64,16 @@ define i32 @main() #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 0, i32* %1, align 4
-  store i32 (i32, i32)* @add, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 0), align 16
+  store i32 (i32, i32)* @add, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 0), align 8
   store i32 (i32, i32)* @sub, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 1), align 8
-  store i32 (i32, i32)* @mul, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 2), align 16
+  store i32 (i32, i32)* @mul, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 2), align 8
   store i32 (i32, i32)* @div, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 3), align 8
   store i32 0, i32* %2, align 4
-  %5 = call i32 (...) @nd_uint()
+  %5 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   store i32 %5, i32* %3, align 4
-  %6 = call i32 (...) @nd_uint()
+  %6 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   store i32 %6, i32* %4, align 4
-  %7 = call i32 (...) @nd_uint()
+  %7 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   switch i32 %7, label %28 [
     i32 0, label %8
     i32 1, label %13
@@ -81,15 +81,15 @@ define i32 @main() #0 {
     i32 3, label %23
   ]
 
-; <label>:8:                                      ; preds = %0
-  %9 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 0), align 16
+8:                                                ; preds = %0
+  %9 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 0), align 8
   %10 = load i32, i32* %3, align 4
   %11 = load i32, i32* %4, align 4
   %12 = call i32 %9(i32 %10, i32 %11)
   store i32 %12, i32* %2, align 4
   br label %29
 
-; <label>:13:                                     ; preds = %0
+13:                                               ; preds = %0
   %14 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 1), align 8
   %15 = load i32, i32* %3, align 4
   %16 = load i32, i32* %4, align 4
@@ -97,15 +97,15 @@ define i32 @main() #0 {
   store i32 %17, i32* %2, align 4
   br label %29
 
-; <label>:18:                                     ; preds = %0
-  %19 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 2), align 16
+18:                                               ; preds = %0
+  %19 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 2), align 8
   %20 = load i32, i32* %3, align 4
   %21 = load i32, i32* %4, align 4
   %22 = call i32 %19(i32 %20, i32 %21)
   store i32 %22, i32* %2, align 4
   br label %29
 
-; <label>:23:                                     ; preds = %0
+23:                                               ; preds = %0
   %24 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x i32 (i32, i32)*], [4 x i32 (i32, i32)*]* @arith_functions, i64 0, i64 3), align 8
   %25 = load i32, i32* %3, align 4
   %26 = load i32, i32* %4, align 4
@@ -113,22 +113,29 @@ define i32 @main() #0 {
   store i32 %27, i32* %2, align 4
   br label %29
 
-; <label>:28:                                     ; preds = %0
+28:                                               ; preds = %0
   br label %29
 
-; <label>:29:                                     ; preds = %28, %23, %18, %13, %8
+29:                                               ; preds = %28, %23, %18, %13, %8
   %30 = load i32, i32* %2, align 4
   ret i32 %30
 }
 
 declare i32 @nd_uint(...) #1
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_12.ll b/tests/complete_callgraph_12.ll
index 04fe4660..cb6ae98f 100644
--- a/tests/complete_callgraph_12.ll
+++ b/tests/complete_callgraph_12.ll
@@ -2,17 +2,18 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_12.dot %T/complete_callgraph_12.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_12.bc'
+
+; ModuleID = 'complete_callgraph_12.c'
 source_filename = "complete_callgraph_12.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.Struct = type { i32*, i32 (i32, i32)* }
 
-@arith_functions = global [4 x %struct.Struct] [%struct.Struct { i32* null, i32 (i32, i32)* @add }, %struct.Struct { i32* null, i32 (i32, i32)* @sub }, %struct.Struct { i32* null, i32 (i32, i32)* @mul }, %struct.Struct { i32* null, i32 (i32, i32)* @div }], align 16
+@arith_functions = global [4 x %struct.Struct] [%struct.Struct { i32* null, i32 (i32, i32)* @add }, %struct.Struct { i32* null, i32 (i32, i32)* @sub }, %struct.Struct { i32* null, i32 (i32, i32)* @mul }, %struct.Struct { i32* null, i32 (i32, i32)* @div }], align 8
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @add(i32, i32) #0 {
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -24,7 +25,7 @@ define i32 @add(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @sub(i32, i32) #0 {
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -36,7 +37,7 @@ define i32 @sub(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @mul(i32, i32) #0 {
+define i32 @mul(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -48,7 +49,7 @@ define i32 @mul(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @div(i32, i32) #0 {
+define i32 @div(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -68,16 +69,16 @@ define i32 @main() #0 {
   %5 = alloca i32, align 4
   store i32 0, i32* %1, align 4
   store i32 789, i32* %2, align 4
-  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 0, i32 0), align 16
-  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 1, i32 0), align 16
-  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 2, i32 0), align 16
-  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 3, i32 0), align 16
+  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 0, i32 0), align 8
+  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 1, i32 0), align 8
+  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 2, i32 0), align 8
+  store i32* %2, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 3, i32 0), align 8
   store i32 0, i32* %3, align 4
-  %6 = call i32 (...) @nd_uint()
+  %6 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   store i32 %6, i32* %4, align 4
-  %7 = call i32 (...) @nd_uint()
+  %7 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   store i32 %7, i32* %5, align 4
-  %8 = call i32 (...) @nd_uint()
+  %8 = call i32 bitcast (i32 (...)* @nd_uint to i32 ()*)()
   switch i32 %8, label %41 [
     i32 0, label %9
     i32 1, label %17
@@ -85,8 +86,8 @@ define i32 @main() #0 {
     i32 3, label %33
   ]
 
-; <label>:9:                                      ; preds = %0
-  %10 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 0, i32 0), align 16
+9:                                                ; preds = %0
+  %10 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 0, i32 0), align 8
   %11 = load i32, i32* %10, align 4
   %12 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 0, i32 1), align 8
   %13 = load i32, i32* %4, align 4
@@ -96,8 +97,8 @@ define i32 @main() #0 {
   store i32 %16, i32* %3, align 4
   br label %42
 
-; <label>:17:                                     ; preds = %0
-  %18 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 1, i32 0), align 16
+17:                                               ; preds = %0
+  %18 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 1, i32 0), align 8
   %19 = load i32, i32* %18, align 4
   %20 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 1, i32 1), align 8
   %21 = load i32, i32* %4, align 4
@@ -107,8 +108,8 @@ define i32 @main() #0 {
   store i32 %24, i32* %3, align 4
   br label %42
 
-; <label>:25:                                     ; preds = %0
-  %26 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 2, i32 0), align 16
+25:                                               ; preds = %0
+  %26 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 2, i32 0), align 8
   %27 = load i32, i32* %26, align 4
   %28 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 2, i32 1), align 8
   %29 = load i32, i32* %4, align 4
@@ -118,8 +119,8 @@ define i32 @main() #0 {
   store i32 %32, i32* %3, align 4
   br label %42
 
-; <label>:33:                                     ; preds = %0
-  %34 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 3, i32 0), align 16
+33:                                               ; preds = %0
+  %34 = load i32*, i32** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 3, i32 0), align 8
   %35 = load i32, i32* %34, align 4
   %36 = load i32 (i32, i32)*, i32 (i32, i32)** getelementptr inbounds ([4 x %struct.Struct], [4 x %struct.Struct]* @arith_functions, i64 0, i64 3, i32 1), align 8
   %37 = load i32, i32* %4, align 4
@@ -129,22 +130,29 @@ define i32 @main() #0 {
   store i32 %40, i32* %3, align 4
   br label %42
 
-; <label>:41:                                     ; preds = %0
+41:                                               ; preds = %0
   br label %42
 
-; <label>:42:                                     ; preds = %41, %33, %25, %17, %9
+42:                                               ; preds = %41, %33, %25, %17, %9
   %43 = load i32, i32* %3, align 4
   ret i32 %43
 }
 
 declare i32 @nd_uint(...) #1
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_13.ll b/tests/complete_callgraph_13.ll
index 85cf1c3d..1f85b23c 100644
--- a/tests/complete_callgraph_13.ll
+++ b/tests/complete_callgraph_13.ll
@@ -4,11 +4,11 @@
 
 ; ModuleID = 'complete_callgraph_13.c'
 source_filename = "complete_callgraph_13.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.15.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @add(i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -19,8 +19,8 @@ define i32 @add(i32, i32) #0 {
   ret i32 %7
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @sub(i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -31,8 +31,8 @@ define i32 @sub(i32, i32) #0 {
   ret i32 %7
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @apply(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -46,16 +46,16 @@ define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
   ret i32 %10
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 (i32, i32)* @bar(i32 (i32, i32)*) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 (i32, i32)* @bar(i32 (i32, i32)* %0) #0 {
   %2 = alloca i32 (i32, i32)*, align 8
   store i32 (i32, i32)* %0, i32 (i32, i32)** %2, align 8
   %3 = load i32 (i32, i32)*, i32 (i32, i32)** %2, align 8
   ret i32 (i32, i32)* %3
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @foo(i32 (i32, i32)*, i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @foo(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -73,7 +73,7 @@ define i32 @foo(i32 (i32, i32)*, i32, i32) #0 {
   ret i32 %13
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define i32 @main() #0 {
   %1 = alloca i32, align 4
   %2 = alloca i32, align 4
@@ -81,7 +81,7 @@ define i32 @main() #0 {
   store i32 0, i32* %1, align 4
   %4 = call i32 @foo(i32 (i32, i32)* @add, i32 2, i32 5)
   store i32 %4, i32* %2, align 4
-  %5 = call i32 (i32, i32)* (...) @nd_binfptr()
+  %5 = call i32 (i32, i32)* bitcast (i32 (i32, i32)* (...)* @nd_binfptr to i32 (i32, i32)* ()*)()
   %6 = call i32 @foo(i32 (i32, i32)* %5, i32 5, i32 7)
   store i32 %6, i32* %3, align 4
   %7 = load i32, i32* %2, align 4
@@ -92,13 +92,19 @@ define i32 @main() #0 {
 
 declare i32 (i32, i32)* @nd_binfptr(...) #1
 
-attributes #0 = { noinline nounwind ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "darwin-stkchk-strong-link" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "probe-stack"="___chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "darwin-stkchk-strong-link" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "probe-stack"="___chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1, !2}
-!llvm.ident = !{!3}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 2, !"SDK Version", [3 x i32] [i32 10, i32 15, i32 4]}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
 !1 = !{i32 1, !"wchar_size", i32 4}
-!2 = !{i32 7, !"PIC Level", i32 2}
-!3 = !{!"Apple clang version 11.0.3 (clang-1103.0.32.29)"}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_13b.ll b/tests/complete_callgraph_13b.ll
index aab96ac8..4d8a642d 100644
--- a/tests/complete_callgraph_13b.ll
+++ b/tests/complete_callgraph_13b.ll
@@ -4,11 +4,11 @@
 
 ; ModuleID = 'complete_callgraph_13b.c'
 source_filename = "complete_callgraph_13b.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.15.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @add(i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -19,8 +19,8 @@ define i32 @add(i32, i32) #0 {
   ret i32 %7
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @sub(i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -31,8 +31,8 @@ define i32 @sub(i32, i32) #0 {
   ret i32 %7
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @apply(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -46,16 +46,16 @@ define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
   ret i32 %10
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 (i32, i32)* @bar(i32 (i32, i32)*) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 (i32, i32)* @bar(i32 (i32, i32)* %0) #0 {
   %2 = alloca i32 (i32, i32)*, align 8
   store i32 (i32, i32)* %0, i32 (i32, i32)** %2, align 8
   %3 = load i32 (i32, i32)*, i32 (i32, i32)** %2, align 8
   ret i32 (i32, i32)* %3
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
-define i32 @foo(i32 (i32, i32)*, i32, i32) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @foo(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -73,7 +73,7 @@ define i32 @foo(i32 (i32, i32)*, i32, i32) #0 {
   ret i32 %13
 }
 
-; Function Attrs: noinline nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define i32 @main() #0 {
   %1 = alloca i32, align 4
   %2 = alloca i32, align 4
@@ -92,13 +92,19 @@ define i32 @main() #0 {
 
 declare noalias i32 (i32, i32)* @nd_binfptr() #1
 
-attributes #0 = { noinline nounwind ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "darwin-stkchk-strong-link" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "probe-stack"="___chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "darwin-stkchk-strong-link" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "probe-stack"="___chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1, !2}
-!llvm.ident = !{!3}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 2, !"SDK Version", [3 x i32] [i32 10, i32 15, i32 4]}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
 !1 = !{i32 1, !"wchar_size", i32 4}
-!2 = !{i32 7, !"PIC Level", i32 2}
-!3 = !{!"Apple clang version 11.0.3 (clang-1103.0.32.29)"}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_14.ll b/tests/complete_callgraph_14.ll
index 1a554b3e..c39b884d 100644
--- a/tests/complete_callgraph_14.ll
+++ b/tests/complete_callgraph_14.ll
@@ -2,10 +2,11 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_14.dot %T/complete_callgraph_14.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_14.bc'
+
+; ModuleID = 'complete_callgraph_14.c'
 source_filename = "complete_callgraph_14.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.Struct = type { i32, i32, i32 (i32)** }
 
@@ -13,7 +14,7 @@ target triple = "x86_64-apple-macosx10.14.0"
 @hash_ptr = global i32 (i32)** @hash, align 8
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @jenkins_hash(i32) #0 {
+define i32 @jenkins_hash(i32 %0) #0 {
   %2 = alloca i32, align 4
   store i32 %0, i32* %2, align 4
   %3 = load i32, i32* %2, align 4
@@ -21,7 +22,7 @@ define i32 @jenkins_hash(i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @MurmurHash3_hash(i32) #0 {
+define i32 @MurmurHash3_hash(i32 %0) #0 {
   %2 = alloca i32, align 4
   store i32 %0, i32* %2, align 4
   %3 = load i32, i32* %2, align 4
@@ -30,28 +31,28 @@ define i32 @MurmurHash3_hash(i32) #0 {
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
 define void @hash_init() #0 {
-  %1 = call i32 (...) @nd()
+  %1 = call i32 bitcast (i32 (...)* @nd to i32 ()*)()
   %2 = icmp ne i32 %1, 0
   br i1 %2, label %3, label %5
 
-; <label>:3:                                      ; preds = %0
+3:                                                ; preds = %0
   %4 = load i32 (i32)**, i32 (i32)*** @hash_ptr, align 8
   store i32 (i32)* @jenkins_hash, i32 (i32)** %4, align 8
   br label %7
 
-; <label>:5:                                      ; preds = %0
+5:                                                ; preds = %0
   %6 = load i32 (i32)**, i32 (i32)*** @hash_ptr, align 8
   store i32 (i32)* @MurmurHash3_hash, i32 (i32)** %6, align 8
   br label %7
 
-; <label>:7:                                      ; preds = %5, %3
+7:                                                ; preds = %5, %3
   ret void
 }
 
 declare i32 @nd(...) #1
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define void @init(%struct.Struct*, void ()*) #0 {
+define void @init(%struct.Struct* %0, void ()* %1) #0 {
   %3 = alloca %struct.Struct*, align 8
   %4 = alloca void ()*, align 8
   store %struct.Struct* %0, %struct.Struct** %3, align 8
@@ -98,14 +99,21 @@ define i32 @main() #0 {
 ; Function Attrs: allocsize(0)
 declare i8* @malloc(i64) #2
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { allocsize(0) "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #2 = { allocsize(0) "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 attributes #3 = { allocsize(0) }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_15.ll b/tests/complete_callgraph_15.ll
index dbc8ab7c..e5ee23fd 100644
--- a/tests/complete_callgraph_15.ll
+++ b/tests/complete_callgraph_15.ll
@@ -2,43 +2,42 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_15.dot %T/complete_callgraph_15.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_15.bc'
+; ModuleID = 'complete_callgraph_15.c'
 source_filename = "complete_callgraph_15.c"
-target datalayout = "e-m:o-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:128-n8:16:32-S128"
-target triple = "i386-apple-macosx10.15.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.test_handler = type { i32 (...)* }
 
-@handle_var = global %struct.test_handler { i32 (...)* bitcast (i32 ()* @foo to i32 (...)*) }, align 4
+@handle_var = global %struct.test_handler { i32 (...)* bitcast (i32 ()* @foo to i32 (...)*) }, align 8
 
-; Function Attrs: nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define i32 @foo() #0 {
   %1 = alloca i32, align 4
-  %2 = bitcast i32* %1 to i8*
-  store i32 0, i32* %1, align 4, !tbaa !4
-  %3 = load i32, i32* %1, align 4, !tbaa !4
-  %4 = bitcast i32* %1 to i8*
-  ret i32 %3
+  store i32 0, i32* %1, align 4
+  %2 = load i32, i32* %1, align 4
+  ret i32 %2
 }
 
-; Function Attrs: nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define %struct.test_handler* @return_handler_struct() #0 {
   ret %struct.test_handler* @handle_var
 }
 
-; Function Attrs: nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define i32 @main() #0 {
   %1 = alloca i32, align 4
   store i32 0, i32* %1, align 4
   %2 = call %struct.test_handler* @return_handler_struct()
   %3 = getelementptr inbounds %struct.test_handler, %struct.test_handler* %2, i32 0, i32 0
-  %4 = load i32 (...)*, i32 (...)** %3, align 4, !tbaa !8
+  %4 = load i32 (...)*, i32 (...)** %3, align 8
   %5 = bitcast i32 (...)* %4 to i32 ()*
   %6 = call i32 %5()
   %7 = icmp eq i32 %6, 0
   br i1 %7, label %9, label %8
 
 8:                                                ; preds = %0
+  call void @__VERIFIER_error()
   br label %9
 
 9:                                                ; preds = %8, %0
@@ -47,22 +46,21 @@ define i32 @main() #0 {
   ret i32 0
 }
 
-attributes #0 = { nounwind ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { argmemonly nounwind willreturn }
-attributes #2 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nounwind }
+declare void @__VERIFIER_error() #1
+
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1, !2}
-!llvm.ident = !{!3}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"NumRegisterParameters", i32 0}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
 !1 = !{i32 1, !"wchar_size", i32 4}
-!2 = !{i32 7, !"PIC Level", i32 2}
-!3 = !{!"clang version 10.0.0 "}
-!4 = !{!5, !5, i64 0}
-!5 = !{!"int", !6, i64 0}
-!6 = !{!"omnipotent char", !7, i64 0}
-!7 = !{!"Simple C/C++ TBAA"}
-!8 = !{!9, !10, i64 0}
-!9 = !{!"test_handler", !10, i64 0}
-!10 = !{!"any pointer", !6, i64 0}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_16.ll b/tests/complete_callgraph_16.ll
index c3d7be23..c38442a1 100644
--- a/tests/complete_callgraph_16.ll
+++ b/tests/complete_callgraph_16.ll
@@ -2,135 +2,125 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_16.dot %T/complete_callgraph_16.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = './test_devirt.bc'
-source_filename = "./test_devirt.c"
-target datalayout = "e-m:o-p:32:32-p270:32:32-p271:32:32-p272:64:64-f64:32:64-f80:128-n8:16:32-S128"
-target triple = "i386-apple-macosx10.15.0"
+; ModuleID = 'complete_callgraph_16.c'
+source_filename = "complete_callgraph_16.c"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.test_handler = type { %struct.test_sub, i32 (...)* }
 %struct.test_sub = type { i32 }
 
-; Function Attrs: nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define i32 @foo() #0 {
   %1 = alloca i32, align 4
-  %2 = bitcast i32* %1 to i8*
-  store i32 0, i32* %1, align 4, !tbaa !4
-  %3 = load i32, i32* %1, align 4, !tbaa !4
-  %4 = icmp eq i32 %3, 0
-  br i1 %4, label %6, label %5
-
-5:                                                ; preds = %0
-  br label %6
-
-6:                                                ; preds = %5, %0
-  %7 = phi i1 [ true, %0 ], [ false, %5 ]
-  %8 = zext i1 %7 to i32
-  %9 = load i32, i32* %1, align 4, !tbaa !4
-  %10 = bitcast i32* %1 to i8*
-  ret i32 %9
+  store i32 0, i32* %1, align 4
+  %2 = load i32, i32* %1, align 4
+  %3 = icmp eq i32 %2, 0
+  br i1 %3, label %5, label %4
+
+4:                                                ; preds = %0
+  call void @__VERIFIER_error()
+  br label %5
+
+5:                                                ; preds = %4, %0
+  %6 = phi i1 [ true, %0 ], [ false, %4 ]
+  %7 = zext i1 %6 to i32
+  %8 = load i32, i32* %1, align 4
+  ret i32 %8
 }
 
-; Function Attrs: nounwind ssp uwtable
+declare void @__VERIFIER_error() #1
+
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define %struct.test_handler* @return_handler_struct() #0 {
-  %1 = alloca %struct.test_handler*, align 4
-  %2 = bitcast %struct.test_handler** %1 to i8*
-  %3 = call i8* @malloc(i32 8) #5
-  %4 = bitcast i8* %3 to %struct.test_handler*
-  store %struct.test_handler* %4, %struct.test_handler** %1, align 4, !tbaa !8
-  %5 = load %struct.test_handler*, %struct.test_handler** %1, align 4, !tbaa !8
-  %6 = getelementptr inbounds %struct.test_handler, %struct.test_handler* %5, i32 0, i32 1
-  store i32 (...)* bitcast (i32 ()* @foo to i32 (...)*), i32 (...)** %6, align 4, !tbaa !10
-  %7 = load %struct.test_handler*, %struct.test_handler** %1, align 4, !tbaa !8
-  %8 = bitcast %struct.test_handler** %1 to i8*
-  ret %struct.test_handler* %7
+  %1 = alloca %struct.test_handler*, align 8
+  %2 = call i8* @malloc(i64 16) #3
+  %3 = bitcast i8* %2 to %struct.test_handler*
+  store %struct.test_handler* %3, %struct.test_handler** %1, align 8
+  %4 = load %struct.test_handler*, %struct.test_handler** %1, align 8
+  %5 = getelementptr inbounds %struct.test_handler, %struct.test_handler* %4, i32 0, i32 1
+  store i32 (...)* bitcast (i32 ()* @foo to i32 (...)*), i32 (...)** %5, align 8
+  %6 = load %struct.test_handler*, %struct.test_handler** %1, align 8
+  ret %struct.test_handler* %6
 }
 
 ; Function Attrs: allocsize(0)
-declare i8* @malloc(i32) #3
+declare i8* @malloc(i64) #2
 
-; Function Attrs: nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define i32 @main(i32 %0, i8** %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
-  %5 = alloca i8**, align 4
-  %6 = alloca %struct.test_handler*, align 4
-  %7 = alloca %struct.test_sub*, align 4
-  %8 = alloca %struct.test_handler*, align 4
+  %5 = alloca i8**, align 8
+  %6 = alloca %struct.test_handler*, align 8
+  %7 = alloca %struct.test_sub*, align 8
+  %8 = alloca %struct.test_handler*, align 8
   store i32 0, i32* %3, align 4
-  store i32 %0, i32* %4, align 4, !tbaa !4
-  store i8** %1, i8*** %5, align 4, !tbaa !8
-  %9 = bitcast %struct.test_handler** %6 to i8*
-  %10 = call %struct.test_handler* @return_handler_struct()
-  store %struct.test_handler* %10, %struct.test_handler** %6, align 4, !tbaa !8
-  %11 = bitcast %struct.test_sub** %7 to i8*
-  %12 = load %struct.test_handler*, %struct.test_handler** %6, align 4, !tbaa !8
-  %13 = bitcast %struct.test_handler* %12 to %struct.test_sub*
-  store %struct.test_sub* %13, %struct.test_sub** %7, align 4, !tbaa !8
-  %14 = bitcast %struct.test_handler** %8 to i8*
-  %15 = load %struct.test_sub*, %struct.test_sub** %7, align 4, !tbaa !8
-  %16 = call %struct.test_handler* @to_test_handler(%struct.test_sub* %15)
-  store %struct.test_handler* %16, %struct.test_handler** %8, align 4, !tbaa !8
-  %17 = load %struct.test_handler*, %struct.test_handler** %8, align 4, !tbaa !8
-  %18 = getelementptr inbounds %struct.test_handler, %struct.test_handler* %17, i32 0, i32 1
-  %19 = load i32 (...)*, i32 (...)** %18, align 4, !tbaa !10
-  %20 = bitcast i32 (...)* %19 to i32 ()*
-  %21 = call i32 %20()
-  %22 = icmp eq i32 %21, 0
-  br i1 %22, label %24, label %23
-
-23:                                               ; preds = %2
-  br label %24
-
-24:                                               ; preds = %23, %2
-  %25 = phi i1 [ true, %2 ], [ false, %23 ]
-  %26 = zext i1 %25 to i32
-  %27 = bitcast %struct.test_handler** %8 to i8*
-  %28 = bitcast %struct.test_sub** %7 to i8*
-  %29 = bitcast %struct.test_handler** %6 to i8*
+  store i32 %0, i32* %4, align 4
+  store i8** %1, i8*** %5, align 8
+  %9 = call %struct.test_handler* @return_handler_struct()
+  store %struct.test_handler* %9, %struct.test_handler** %6, align 8
+  %10 = load %struct.test_handler*, %struct.test_handler** %6, align 8
+  %11 = bitcast %struct.test_handler* %10 to %struct.test_sub*
+  store %struct.test_sub* %11, %struct.test_sub** %7, align 8
+  %12 = load %struct.test_sub*, %struct.test_sub** %7, align 8
+  %13 = call %struct.test_handler* @to_test_handler(%struct.test_sub* %12)
+  store %struct.test_handler* %13, %struct.test_handler** %8, align 8
+  %14 = load %struct.test_handler*, %struct.test_handler** %8, align 8
+  %15 = getelementptr inbounds %struct.test_handler, %struct.test_handler* %14, i32 0, i32 1
+  %16 = load i32 (...)*, i32 (...)** %15, align 8
+  %17 = bitcast i32 (...)* %16 to i32 ()*
+  %18 = call i32 %17()
+  %19 = icmp eq i32 %18, 0
+  br i1 %19, label %21, label %20
+
+20:                                               ; preds = %2
+  call void @__VERIFIER_error()
+  br label %21
+
+21:                                               ; preds = %20, %2
+  %22 = phi i1 [ true, %2 ], [ false, %20 ]
+  %23 = zext i1 %22 to i32
   ret i32 0
 }
 
-; Function Attrs: nounwind ssp uwtable
+; Function Attrs: noinline nounwind optnone ssp uwtable
 define internal %struct.test_handler* @to_test_handler(%struct.test_sub* %0) #0 {
-  %2 = alloca %struct.test_sub*, align 4
-  store %struct.test_sub* %0, %struct.test_sub** %2, align 4, !tbaa !8
-  %3 = load %struct.test_sub*, %struct.test_sub** %2, align 4, !tbaa !8
+  %2 = alloca %struct.test_sub*, align 8
+  store %struct.test_sub* %0, %struct.test_sub** %2, align 8
+  %3 = load %struct.test_sub*, %struct.test_sub** %2, align 8
   %4 = icmp ne %struct.test_sub* %3, null
   br i1 %4, label %6, label %5
 
 5:                                                ; preds = %1
+  call void @__VERIFIER_error()
   br label %6
 
 6:                                                ; preds = %5, %1
   %7 = phi i1 [ true, %1 ], [ false, %5 ]
   %8 = zext i1 %7 to i32
-  %9 = load %struct.test_sub*, %struct.test_sub** %2, align 4, !tbaa !8
-  %10 = ptrtoint %struct.test_sub* %9 to i32
-  %11 = sub i32 %10, 0
-  %12 = inttoptr i32 %11 to %struct.test_handler*
+  %9 = load %struct.test_sub*, %struct.test_sub** %2, align 8
+  %10 = ptrtoint %struct.test_sub* %9 to i64
+  %11 = sub i64 %10, 0
+  %12 = inttoptr i64 %11 to %struct.test_handler*
   ret %struct.test_handler* %12
 }
 
-attributes #0 = { nounwind ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { argmemonly nounwind willreturn }
-attributes #2 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { allocsize(0) "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #4 = { nounwind }
-attributes #5 = { allocsize(0) }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #2 = { allocsize(0) "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #3 = { allocsize(0) }
 
-!llvm.module.flags = !{!0, !1, !2}
-!llvm.ident = !{!3}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"NumRegisterParameters", i32 0}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
 !1 = !{i32 1, !"wchar_size", i32 4}
-!2 = !{i32 7, !"PIC Level", i32 2}
-!3 = !{!"clang version 10.0.0 "}
-!4 = !{!5, !5, i64 0}
-!5 = !{!"int", !6, i64 0}
-!6 = !{!"omnipotent char", !7, i64 0}
-!7 = !{!"Simple C/C++ TBAA"}
-!8 = !{!9, !9, i64 0}
-!9 = !{!"any pointer", !6, i64 0}
-!10 = !{!11, !9, i64 4}
-!11 = !{!"test_handler", !12, i64 0, !9, i64 4}
-!12 = !{!"test_sub", !5, i64 0}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_17.ll b/tests/complete_callgraph_17.ll
index 1e85a45a..f8bb84b1 100644
--- a/tests/complete_callgraph_17.ll
+++ b/tests/complete_callgraph_17.ll
@@ -2,23 +2,22 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_17.dot %T/complete_callgraph_17.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-
-; ModuleID = 'complete_callgraph_17.bc'
+; ModuleID = 'complete_callgraph_17.cpp'
 source_filename = "complete_callgraph_17.cpp"
-target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.15.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %class.BaseClass = type { i32 (...)** }
 %class.DerivedClass = type { %class.BaseClass }
 
-@_ZTV12DerivedClass = linkonce_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTI12DerivedClass to i8*), i8* bitcast (void (%class.DerivedClass*)* @_ZN12DerivedClassD1Ev to i8*), i8* bitcast (void (%class.DerivedClass*)* @_ZN12DerivedClassD0Ev to i8*), i8* bitcast (i32 (%class.DerivedClass*)* @_ZN12DerivedClass4FuncEv to i8*)] }, align 8
+@_ZTV12DerivedClass = linkonce_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8*, i8* }* @_ZTI12DerivedClass to i8*), i8* bitcast (%class.DerivedClass* (%class.DerivedClass*)* @_ZN12DerivedClassD1Ev to i8*), i8* bitcast (void (%class.DerivedClass*)* @_ZN12DerivedClassD0Ev to i8*), i8* bitcast (i32 (%class.DerivedClass*)* @_ZN12DerivedClass4FuncEv to i8*)] }, align 8
 @_ZTVN10__cxxabiv120__si_class_type_infoE = external global i8*
-@_ZTS12DerivedClass = linkonce_odr constant [15 x i8] c"12DerivedClass\00", align 1
+@_ZTS12DerivedClass = linkonce_odr hidden constant [15 x i8] c"12DerivedClass\00", align 1
 @_ZTVN10__cxxabiv117__class_type_infoE = external global i8*
-@_ZTS9BaseClass = linkonce_odr constant [11 x i8] c"9BaseClass\00", align 1
-@_ZTI9BaseClass = linkonce_odr constant { i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv117__class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([11 x i8], [11 x i8]* @_ZTS9BaseClass, i32 0, i32 0) }, align 8
-@_ZTI12DerivedClass = linkonce_odr constant { i8*, i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* getelementptr inbounds ([15 x i8], [15 x i8]* @_ZTS12DerivedClass, i32 0, i32 0), i8* bitcast ({ i8*, i8* }* @_ZTI9BaseClass to i8*) }, align 8
-@_ZTV9BaseClass = linkonce_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI9BaseClass to i8*), i8* bitcast (void (%class.BaseClass*)* @_ZN9BaseClassD1Ev to i8*), i8* bitcast (void (%class.BaseClass*)* @_ZN9BaseClassD0Ev to i8*), i8* bitcast (i32 (%class.BaseClass*)* @_ZN9BaseClass4FuncEv to i8*)] }, align 8
+@_ZTS9BaseClass = linkonce_odr hidden constant [11 x i8] c"9BaseClass\00", align 1
+@_ZTI9BaseClass = linkonce_odr hidden constant { i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv117__class_type_infoE, i64 2) to i8*), i8* inttoptr (i64 add (i64 ptrtoint ([11 x i8]* @_ZTS9BaseClass to i64), i64 -9223372036854775808) to i8*) }, align 8
+@_ZTI12DerivedClass = linkonce_odr hidden constant { i8*, i8*, i8* } { i8* bitcast (i8** getelementptr inbounds (i8*, i8** @_ZTVN10__cxxabiv120__si_class_type_infoE, i64 2) to i8*), i8* inttoptr (i64 add (i64 ptrtoint ([15 x i8]* @_ZTS12DerivedClass to i64), i64 -9223372036854775808) to i8*), i8* bitcast ({ i8*, i8* }* @_ZTI9BaseClass to i8*) }, align 8
+@_ZTV9BaseClass = linkonce_odr unnamed_addr constant { [5 x i8*] } { [5 x i8*] [i8* null, i8* bitcast ({ i8*, i8* }* @_ZTI9BaseClass to i8*), i8* bitcast (%class.BaseClass* (%class.BaseClass*)* @_ZN9BaseClassD1Ev to i8*), i8* bitcast (void (%class.BaseClass*)* @_ZN9BaseClassD0Ev to i8*), i8* bitcast (i32 (%class.BaseClass*)* @_ZN9BaseClass4FuncEv to i8*)] }, align 8
 
 ; Function Attrs: noinline norecurse optnone ssp uwtable
 define i32 @main(i32 %0, i8** %1) #0 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
@@ -26,55 +25,55 @@ define i32 @main(i32 %0, i8** %1) #0 personality i8* bitcast (i32 (...)* @__gxx_
   %4 = alloca i32, align 4
   %5 = alloca i8**, align 8
   %6 = alloca %class.BaseClass*, align 8
-  %7 = alloca i8*
-  %8 = alloca i32
+  %7 = alloca i8*, align 8
+  %8 = alloca i32, align 4
   store i32 0, i32* %3, align 4
   store i32 %0, i32* %4, align 4
   store i8** %1, i8*** %5, align 8
-  %9 = call i8* @_Znwm(i64 8) #5
+  %9 = call noalias nonnull i8* @_Znwm(i64 8) #5
   %10 = bitcast i8* %9 to %class.DerivedClass*
-  invoke void @_ZN12DerivedClassC1Ev(%class.DerivedClass* %10)
-          to label %11 unwind label %19
-
-11:                                               ; preds = %2
-  %12 = bitcast %class.DerivedClass* %10 to %class.BaseClass*
-  store %class.BaseClass* %12, %class.BaseClass** %6, align 8
-  %13 = load %class.BaseClass*, %class.BaseClass** %6, align 8
-  %14 = bitcast %class.BaseClass* %13 to i32 (%class.BaseClass*)***
-  %15 = load i32 (%class.BaseClass*)**, i32 (%class.BaseClass*)*** %14, align 8
-  %16 = getelementptr inbounds i32 (%class.BaseClass*)*, i32 (%class.BaseClass*)** %15, i64 2
-  %17 = load i32 (%class.BaseClass*)*, i32 (%class.BaseClass*)** %16, align 8
-  %18 = call i32 %17(%class.BaseClass* %13)
-  ret i32 %18
-
-19:                                               ; preds = %2
-  %20 = landingpad { i8*, i32 }
+  %11 = invoke %class.DerivedClass* @_ZN12DerivedClassC1Ev(%class.DerivedClass* %10)
+          to label %12 unwind label %20
+
+12:                                               ; preds = %2
+  %13 = bitcast %class.DerivedClass* %10 to %class.BaseClass*
+  store %class.BaseClass* %13, %class.BaseClass** %6, align 8
+  %14 = load %class.BaseClass*, %class.BaseClass** %6, align 8
+  %15 = bitcast %class.BaseClass* %14 to i32 (%class.BaseClass*)***
+  %16 = load i32 (%class.BaseClass*)**, i32 (%class.BaseClass*)*** %15, align 8
+  %17 = getelementptr inbounds i32 (%class.BaseClass*)*, i32 (%class.BaseClass*)** %16, i64 2
+  %18 = load i32 (%class.BaseClass*)*, i32 (%class.BaseClass*)** %17, align 8
+  %19 = call i32 %18(%class.BaseClass* %14)
+  ret i32 %19
+
+20:                                               ; preds = %2
+  %21 = landingpad { i8*, i32 }
           cleanup
-  %21 = extractvalue { i8*, i32 } %20, 0
-  store i8* %21, i8** %7, align 8
-  %22 = extractvalue { i8*, i32 } %20, 1
-  store i32 %22, i32* %8, align 4
+  %22 = extractvalue { i8*, i32 } %21, 0
+  store i8* %22, i8** %7, align 8
+  %23 = extractvalue { i8*, i32 } %21, 1
+  store i32 %23, i32* %8, align 4
   call void @_ZdlPv(i8* %9) #6
-  br label %23
-
-23:                                               ; preds = %19
-  %24 = load i8*, i8** %7, align 8
-  %25 = load i32, i32* %8, align 4
-  %26 = insertvalue { i8*, i32 } undef, i8* %24, 0
-  %27 = insertvalue { i8*, i32 } %26, i32 %25, 1
-  resume { i8*, i32 } %27
+  br label %24
+
+24:                                               ; preds = %20
+  %25 = load i8*, i8** %7, align 8
+  %26 = load i32, i32* %8, align 4
+  %27 = insertvalue { i8*, i32 } undef, i8* %25, 0
+  %28 = insertvalue { i8*, i32 } %27, i32 %26, 1
+  resume { i8*, i32 } %28
 }
 
-; Function Attrs: nobuiltin
-declare noalias i8* @_Znwm(i64) #1
+; Function Attrs: nobuiltin allocsize(0)
+declare nonnull i8* @_Znwm(i64) #1
 
 ; Function Attrs: noinline optnone ssp uwtable
-define linkonce_odr void @_ZN12DerivedClassC1Ev(%class.DerivedClass* %0) unnamed_addr #2 align 2 {
+define linkonce_odr %class.DerivedClass* @_ZN12DerivedClassC1Ev(%class.DerivedClass* returned %0) unnamed_addr #2 align 2 {
   %2 = alloca %class.DerivedClass*, align 8
   store %class.DerivedClass* %0, %class.DerivedClass** %2, align 8
   %3 = load %class.DerivedClass*, %class.DerivedClass** %2, align 8
-  call void @_ZN12DerivedClassC2Ev(%class.DerivedClass* %3)
-  ret void
+  %4 = call %class.DerivedClass* @_ZN12DerivedClassC2Ev(%class.DerivedClass* %3)
+  ret %class.DerivedClass* %3
 }
 
 declare i32 @__gxx_personality_v0(...)
@@ -83,45 +82,68 @@ declare i32 @__gxx_personality_v0(...)
 declare void @_ZdlPv(i8*) #3
 
 ; Function Attrs: noinline optnone ssp uwtable
-define linkonce_odr void @_ZN12DerivedClassC2Ev(%class.DerivedClass* %0) unnamed_addr #2 align 2 {
+define linkonce_odr %class.DerivedClass* @_ZN12DerivedClassC2Ev(%class.DerivedClass* returned %0) unnamed_addr #2 align 2 {
   %2 = alloca %class.DerivedClass*, align 8
   store %class.DerivedClass* %0, %class.DerivedClass** %2, align 8
   %3 = load %class.DerivedClass*, %class.DerivedClass** %2, align 8
   %4 = bitcast %class.DerivedClass* %3 to %class.BaseClass*
-  call void @_ZN9BaseClassC2Ev(%class.BaseClass* %4)
-  %5 = bitcast %class.DerivedClass* %3 to i32 (...)***
-  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTV12DerivedClass, i32 0, inrange i32 0, i32 2) to i32 (...)**), i32 (...)*** %5, align 8
-  ret void
+  %5 = call %class.BaseClass* @_ZN9BaseClassC2Ev(%class.BaseClass* %4)
+  %6 = bitcast %class.DerivedClass* %3 to i32 (...)***
+  store i32 (...)** bitcast (i8** getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTV12DerivedClass, i32 0, inrange i32 0, i32 2) to i32 (...)**), i32 (...)*** %6, align 8
+  ret %class.DerivedClass* %3
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define linkonce_odr void @_ZN9BaseClassC2Ev(%class.BaseClass* %0) unnamed_addr #4 align 2 {
+define linkonce_odr %class.BaseClass* @_ZN9BaseClassC2Ev(%class.BaseClass* returned %0) unnamed_addr #4 align 2 {
   %2 = alloca %class.BaseClass*, align 8
   store %class.BaseClass* %0, %class.BaseClass** %2, align 8
   %3 = load %class.BaseClass*, %class.BaseClass** %2, align 8
   %4 = bitcast %class.BaseClass* %3 to i32 (...)***
   store i32 (...)** bitcast (i8** getelementptr inbounds ({ [5 x i8*] }, { [5 x i8*] }* @_ZTV9BaseClass, i32 0, inrange i32 0, i32 2) to i32 (...)**), i32 (...)*** %4, align 8
-  ret void
+  ret %class.BaseClass* %3
 }
 
-; Function Attrs: noinline nounwind optnone ssp uwtable
-define linkonce_odr void @_ZN12DerivedClassD1Ev(%class.DerivedClass* %0) unnamed_addr #4 align 2 {
+; Function Attrs: noinline optnone ssp uwtable
+define linkonce_odr %class.DerivedClass* @_ZN12DerivedClassD1Ev(%class.DerivedClass* returned %0) unnamed_addr #2 align 2 {
   %2 = alloca %class.DerivedClass*, align 8
   store %class.DerivedClass* %0, %class.DerivedClass** %2, align 8
   %3 = load %class.DerivedClass*, %class.DerivedClass** %2, align 8
-  call void @_ZN12DerivedClassD2Ev(%class.DerivedClass* %3) #7
-  ret void
+  %4 = call %class.DerivedClass* @_ZN12DerivedClassD2Ev(%class.DerivedClass* %3)
+  ret %class.DerivedClass* %3
 }
 
-; Function Attrs: noinline nounwind optnone ssp uwtable
-define linkonce_odr void @_ZN12DerivedClassD0Ev(%class.DerivedClass* %0) unnamed_addr #4 align 2 {
+; Function Attrs: noinline optnone ssp uwtable
+define linkonce_odr void @_ZN12DerivedClassD0Ev(%class.DerivedClass* %0) unnamed_addr #2 align 2 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
   %2 = alloca %class.DerivedClass*, align 8
+  %3 = alloca i8*, align 8
+  %4 = alloca i32, align 4
   store %class.DerivedClass* %0, %class.DerivedClass** %2, align 8
-  %3 = load %class.DerivedClass*, %class.DerivedClass** %2, align 8
-  call void @_ZN12DerivedClassD1Ev(%class.DerivedClass* %3) #7
-  %4 = bitcast %class.DerivedClass* %3 to i8*
-  call void @_ZdlPv(i8* %4) #6
+  %5 = load %class.DerivedClass*, %class.DerivedClass** %2, align 8
+  %6 = invoke %class.DerivedClass* @_ZN12DerivedClassD1Ev(%class.DerivedClass* %5)
+          to label %7 unwind label %9
+
+7:                                                ; preds = %1
+  %8 = bitcast %class.DerivedClass* %5 to i8*
+  call void @_ZdlPv(i8* %8) #6
   ret void
+
+9:                                                ; preds = %1
+  %10 = landingpad { i8*, i32 }
+          cleanup
+  %11 = extractvalue { i8*, i32 } %10, 0
+  store i8* %11, i8** %3, align 8
+  %12 = extractvalue { i8*, i32 } %10, 1
+  store i32 %12, i32* %4, align 4
+  %13 = bitcast %class.DerivedClass* %5 to i8*
+  call void @_ZdlPv(i8* %13) #6
+  br label %14
+
+14:                                               ; preds = %9
+  %15 = load i8*, i8** %3, align 8
+  %16 = load i32, i32* %4, align 4
+  %17 = insertvalue { i8*, i32 } undef, i8* %15, 0
+  %18 = insertvalue { i8*, i32 } %17, i32 %16, 1
+  resume { i8*, i32 } %18
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
@@ -132,24 +154,47 @@ define linkonce_odr i32 @_ZN12DerivedClass4FuncEv(%class.DerivedClass* %0) unnam
   ret i32 1
 }
 
-; Function Attrs: noinline nounwind optnone ssp uwtable
-define linkonce_odr void @_ZN9BaseClassD1Ev(%class.BaseClass* %0) unnamed_addr #4 align 2 {
+; Function Attrs: noinline optnone ssp uwtable
+define linkonce_odr %class.BaseClass* @_ZN9BaseClassD1Ev(%class.BaseClass* returned %0) unnamed_addr #2 align 2 {
   %2 = alloca %class.BaseClass*, align 8
   store %class.BaseClass* %0, %class.BaseClass** %2, align 8
   %3 = load %class.BaseClass*, %class.BaseClass** %2, align 8
-  call void @_ZN9BaseClassD2Ev(%class.BaseClass* %3) #7
-  ret void
+  %4 = call %class.BaseClass* @_ZN9BaseClassD2Ev(%class.BaseClass* %3)
+  ret %class.BaseClass* %3
 }
 
-; Function Attrs: noinline nounwind optnone ssp uwtable
-define linkonce_odr void @_ZN9BaseClassD0Ev(%class.BaseClass* %0) unnamed_addr #4 align 2 {
+; Function Attrs: noinline optnone ssp uwtable
+define linkonce_odr void @_ZN9BaseClassD0Ev(%class.BaseClass* %0) unnamed_addr #2 align 2 personality i8* bitcast (i32 (...)* @__gxx_personality_v0 to i8*) {
   %2 = alloca %class.BaseClass*, align 8
+  %3 = alloca i8*, align 8
+  %4 = alloca i32, align 4
   store %class.BaseClass* %0, %class.BaseClass** %2, align 8
-  %3 = load %class.BaseClass*, %class.BaseClass** %2, align 8
-  call void @_ZN9BaseClassD1Ev(%class.BaseClass* %3) #7
-  %4 = bitcast %class.BaseClass* %3 to i8*
-  call void @_ZdlPv(i8* %4) #6
+  %5 = load %class.BaseClass*, %class.BaseClass** %2, align 8
+  %6 = invoke %class.BaseClass* @_ZN9BaseClassD1Ev(%class.BaseClass* %5)
+          to label %7 unwind label %9
+
+7:                                                ; preds = %1
+  %8 = bitcast %class.BaseClass* %5 to i8*
+  call void @_ZdlPv(i8* %8) #6
   ret void
+
+9:                                                ; preds = %1
+  %10 = landingpad { i8*, i32 }
+          cleanup
+  %11 = extractvalue { i8*, i32 } %10, 0
+  store i8* %11, i8** %3, align 8
+  %12 = extractvalue { i8*, i32 } %10, 1
+  store i32 %12, i32* %4, align 4
+  %13 = bitcast %class.BaseClass* %5 to i8*
+  call void @_ZdlPv(i8* %13) #6
+  br label %14
+
+14:                                               ; preds = %9
+  %15 = load i8*, i8** %3, align 8
+  %16 = load i32, i32* %4, align 4
+  %17 = insertvalue { i8*, i32 } undef, i8* %15, 0
+  %18 = insertvalue { i8*, i32 } %17, i32 %16, 1
+  resume { i8*, i32 } %18
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
@@ -161,35 +206,41 @@ define linkonce_odr i32 @_ZN9BaseClass4FuncEv(%class.BaseClass* %0) unnamed_addr
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define linkonce_odr void @_ZN9BaseClassD2Ev(%class.BaseClass* %0) unnamed_addr #4 align 2 {
+define linkonce_odr %class.BaseClass* @_ZN9BaseClassD2Ev(%class.BaseClass* returned %0) unnamed_addr #4 align 2 {
   %2 = alloca %class.BaseClass*, align 8
   store %class.BaseClass* %0, %class.BaseClass** %2, align 8
   %3 = load %class.BaseClass*, %class.BaseClass** %2, align 8
-  ret void
+  ret %class.BaseClass* %3
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define linkonce_odr void @_ZN12DerivedClassD2Ev(%class.DerivedClass* %0) unnamed_addr #4 align 2 {
+define linkonce_odr %class.DerivedClass* @_ZN12DerivedClassD2Ev(%class.DerivedClass* returned %0) unnamed_addr #4 align 2 {
   %2 = alloca %class.DerivedClass*, align 8
   store %class.DerivedClass* %0, %class.DerivedClass** %2, align 8
   %3 = load %class.DerivedClass*, %class.DerivedClass** %2, align 8
   %4 = bitcast %class.DerivedClass* %3 to %class.BaseClass*
-  call void @_ZN9BaseClassD2Ev(%class.BaseClass* %4) #7
-  ret void
+  %5 = call %class.BaseClass* @_ZN9BaseClassD2Ev(%class.BaseClass* %4)
+  ret %class.DerivedClass* %3
 }
 
-attributes #0 = { noinline norecurse optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { nobuiltin "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { noinline optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nobuiltin nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #4 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #5 = { builtin }
+attributes #0 = { noinline norecurse optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { nobuiltin allocsize(0) "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #2 = { noinline optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #3 = { nobuiltin nounwind "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #4 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #5 = { builtin allocsize(0) }
 attributes #6 = { builtin nounwind }
-attributes #7 = { nounwind }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 10.0.0 "}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_2.ll b/tests/complete_callgraph_2.ll
index 0ca6d5c9..bed4e8c4 100644
--- a/tests/complete_callgraph_2.ll
+++ b/tests/complete_callgraph_2.ll
@@ -2,15 +2,15 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_2.dot %T/complete_callgraph_2.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_2.bc'
+; ModuleID = 'complete_callgraph_2.c'
 source_filename = "complete_callgraph_2.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.class_t = type { {}*, {}* }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo(%struct.class_t*, i32) #0 {
+define i32 @foo(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -20,7 +20,7 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   %7 = icmp sgt i32 %6, 10
   br i1 %7, label %8, label %17
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load %struct.class_t*, %struct.class_t** %4, align 8
   %10 = getelementptr inbounds %struct.class_t, %struct.class_t* %9, i32 0, i32 1
   %11 = bitcast {}** %10 to i32 (%struct.class_t*, i32)**
@@ -32,18 +32,18 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   store i32 %16, i32* %3, align 4
   br label %19
 
-; <label>:17:                                     ; preds = %2
+17:                                               ; preds = %2
   %18 = load i32, i32* %5, align 4
   store i32 %18, i32* %3, align 4
   br label %19
 
-; <label>:19:                                     ; preds = %17, %8
+19:                                               ; preds = %17, %8
   %20 = load i32, i32* %3, align 4
   ret i32 %20
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @bar(%struct.class_t*, i32) #0 {
+define i32 @bar(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -53,19 +53,19 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   %7 = icmp slt i32 %6, 100
   br i1 %7, label %8, label %11
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load i32, i32* %5, align 4
   %10 = add nsw i32 %9, 10
   store i32 %10, i32* %3, align 4
   br label %14
 
-; <label>:11:                                     ; preds = %2
+11:                                               ; preds = %2
   %12 = load i32, i32* %5, align 4
   %13 = sub nsw i32 %12, 5
   store i32 %13, i32* %3, align 4
   br label %14
 
-; <label>:14:                                     ; preds = %11, %8
+14:                                               ; preds = %11, %8
   %15 = load i32, i32* %3, align 4
   ret i32 %15
 }
@@ -87,11 +87,18 @@ define i32 @main() #0 {
   ret i32 0
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_3.ll b/tests/complete_callgraph_3.ll
index 22dbe192..b77cd877 100644
--- a/tests/complete_callgraph_3.ll
+++ b/tests/complete_callgraph_3.ll
@@ -2,15 +2,15 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_3.dot %T/complete_callgraph_3.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_3.bc'
+; ModuleID = 'complete_callgraph_3.c'
 source_filename = "complete_callgraph_3.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.class_t = type { {}*, {}* }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo(%struct.class_t*, i32) #0 {
+define i32 @foo(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -20,7 +20,7 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   %7 = icmp sgt i32 %6, 10
   br i1 %7, label %8, label %17
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load %struct.class_t*, %struct.class_t** %4, align 8
   %10 = getelementptr inbounds %struct.class_t, %struct.class_t* %9, i32 0, i32 1
   %11 = bitcast {}** %10 to i32 (%struct.class_t*, i32)**
@@ -32,18 +32,18 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   store i32 %16, i32* %3, align 4
   br label %19
 
-; <label>:17:                                     ; preds = %2
+17:                                               ; preds = %2
   %18 = load i32, i32* %5, align 4
   store i32 %18, i32* %3, align 4
   br label %19
 
-; <label>:19:                                     ; preds = %17, %8
+19:                                               ; preds = %17, %8
   %20 = load i32, i32* %3, align 4
   ret i32 %20
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @bar(%struct.class_t*, i32) #0 {
+define i32 @bar(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -53,19 +53,19 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   %7 = icmp slt i32 %6, 100
   br i1 %7, label %8, label %11
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load i32, i32* %5, align 4
   %10 = add nsw i32 %9, 10
   store i32 %10, i32* %3, align 4
   br label %14
 
-; <label>:11:                                     ; preds = %2
+11:                                               ; preds = %2
   %12 = load i32, i32* %5, align 4
   %13 = sub nsw i32 %12, 5
   store i32 %13, i32* %3, align 4
   br label %14
 
-; <label>:14:                                     ; preds = %11, %8
+14:                                               ; preds = %11, %8
   %15 = load i32, i32* %3, align 4
   ret i32 %15
 }
@@ -90,11 +90,18 @@ define i32 @main() #0 {
   ret i32 0
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_4.ll b/tests/complete_callgraph_4.ll
index 601d2777..3ff26979 100644
--- a/tests/complete_callgraph_4.ll
+++ b/tests/complete_callgraph_4.ll
@@ -2,15 +2,16 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_4.dot %T/complete_callgraph_4.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_4.bc'
-source_filename = "../tests/c/complete_callgraph_4.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+
+; ModuleID = 'complete_callgraph_4.c'
+source_filename = "complete_callgraph_4.c"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.class_t = type { {}*, {}*, {}* }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo(%struct.class_t*, i32) #0 {
+define i32 @foo(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -20,7 +21,7 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   %7 = icmp sgt i32 %6, 10
   br i1 %7, label %8, label %17
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load %struct.class_t*, %struct.class_t** %4, align 8
   %10 = getelementptr inbounds %struct.class_t, %struct.class_t* %9, i32 0, i32 1
   %11 = bitcast {}** %10 to i32 (%struct.class_t*, i32)**
@@ -32,18 +33,18 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   store i32 %16, i32* %3, align 4
   br label %19
 
-; <label>:17:                                     ; preds = %2
+17:                                               ; preds = %2
   %18 = load i32, i32* %5, align 4
   store i32 %18, i32* %3, align 4
   br label %19
 
-; <label>:19:                                     ; preds = %17, %8
+19:                                               ; preds = %17, %8
   %20 = load i32, i32* %3, align 4
   ret i32 %20
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @bar(%struct.class_t*, i32) #0 {
+define i32 @bar(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -53,7 +54,7 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   %7 = icmp slt i32 %6, 100
   br i1 %7, label %8, label %17
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load i32, i32* %5, align 4
   %10 = load %struct.class_t*, %struct.class_t** %4, align 8
   %11 = getelementptr inbounds %struct.class_t, %struct.class_t* %10, i32 0, i32 2
@@ -65,19 +66,19 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   store i32 %16, i32* %3, align 4
   br label %20
 
-; <label>:17:                                     ; preds = %2
+17:                                               ; preds = %2
   %18 = load i32, i32* %5, align 4
   %19 = sub nsw i32 %18, 5
   store i32 %19, i32* %3, align 4
   br label %20
 
-; <label>:20:                                     ; preds = %17, %8
+20:                                               ; preds = %17, %8
   %21 = load i32, i32* %3, align 4
   ret i32 %21
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @bar2(%struct.class_t*, i32) #0 {
+define i32 @bar2(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -87,19 +88,19 @@ define i32 @bar2(%struct.class_t*, i32) #0 {
   %7 = icmp slt i32 %6, 100
   br i1 %7, label %8, label %11
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load i32, i32* %5, align 4
   %10 = add nsw i32 %9, 10
   store i32 %10, i32* %3, align 4
   br label %14
 
-; <label>:11:                                     ; preds = %2
+11:                                               ; preds = %2
   %12 = load i32, i32* %5, align 4
   %13 = sub nsw i32 %12, 5
   store i32 %13, i32* %3, align 4
   br label %14
 
-; <label>:14:                                     ; preds = %11, %8
+14:                                               ; preds = %11, %8
   %15 = load i32, i32* %3, align 4
   ret i32 %15
 }
@@ -127,11 +128,18 @@ define i32 @main() #0 {
   ret i32 0
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_5.ll b/tests/complete_callgraph_5.ll
index 9cb2cffd..431edd33 100644
--- a/tests/complete_callgraph_5.ll
+++ b/tests/complete_callgraph_5.ll
@@ -2,15 +2,16 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_5.dot %T/complete_callgraph_5.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_5.bc'
+
+; ModuleID = 'complete_callgraph_5.c'
 source_filename = "complete_callgraph_5.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.class_t = type { {}*, {}* }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo(%struct.class_t*, i32) #0 {
+define i32 @foo(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -20,7 +21,7 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   %7 = icmp sgt i32 %6, 10
   br i1 %7, label %8, label %17
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load %struct.class_t*, %struct.class_t** %4, align 8
   %10 = getelementptr inbounds %struct.class_t, %struct.class_t* %9, i32 0, i32 1
   %11 = bitcast {}** %10 to i32 (%struct.class_t*, i32)**
@@ -32,18 +33,18 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   store i32 %16, i32* %3, align 4
   br label %19
 
-; <label>:17:                                     ; preds = %2
+17:                                               ; preds = %2
   %18 = load i32, i32* %5, align 4
   store i32 %18, i32* %3, align 4
   br label %19
 
-; <label>:19:                                     ; preds = %17, %8
+19:                                               ; preds = %17, %8
   %20 = load i32, i32* %3, align 4
   ret i32 %20
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @bar(%struct.class_t*, i32) #0 {
+define i32 @bar(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -53,7 +54,7 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   %7 = icmp slt i32 %6, 100
   br i1 %7, label %8, label %17
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load i32, i32* %5, align 4
   %10 = load %struct.class_t*, %struct.class_t** %4, align 8
   %11 = getelementptr inbounds %struct.class_t, %struct.class_t* %10, i32 0, i32 0
@@ -65,13 +66,13 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   store i32 %16, i32* %3, align 4
   br label %20
 
-; <label>:17:                                     ; preds = %2
+17:                                               ; preds = %2
   %18 = load i32, i32* %5, align 4
   %19 = sub nsw i32 %18, 5
   store i32 %19, i32* %3, align 4
   br label %20
 
-; <label>:20:                                     ; preds = %17, %8
+20:                                               ; preds = %17, %8
   %21 = load i32, i32* %3, align 4
   ret i32 %21
 }
@@ -96,11 +97,18 @@ define i32 @main() #0 {
   ret i32 0
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_6.ll b/tests/complete_callgraph_6.ll
index 590c1bdf..f4ffa997 100644
--- a/tests/complete_callgraph_6.ll
+++ b/tests/complete_callgraph_6.ll
@@ -2,13 +2,13 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_6.dot %T/complete_callgraph_6.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_6.bc'
+; ModuleID = 'complete_callgraph_6.c'
 source_filename = "complete_callgraph_6.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @add(i32, i32) #0 {
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -20,7 +20,7 @@ define i32 @add(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @sub(i32, i32) #0 {
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -32,7 +32,7 @@ define i32 @sub(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @mul(i32, i32) #0 {
+define i32 @mul(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -44,7 +44,7 @@ define i32 @mul(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @use(i32 (i32, i32)*) #0 {
+define i32 @use(i32 (i32, i32)* %0) #0 {
   %2 = alloca i32 (i32, i32)*, align 8
   %3 = alloca i32, align 4
   store i32 (i32, i32)* %0, i32 (i32, i32)** %2, align 8
@@ -93,11 +93,18 @@ define i32 @main() #0 {
   ret i32 %4
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_7.ll b/tests/complete_callgraph_7.ll
index be344bb7..fab79573 100644
--- a/tests/complete_callgraph_7.ll
+++ b/tests/complete_callgraph_7.ll
@@ -2,13 +2,13 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_7.dot %T/complete_callgraph_7.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_7.bc'
+; ModuleID = 'complete_callgraph_7.c'
 source_filename = "complete_callgraph_7.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @add(i32, i32) #0 {
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -20,7 +20,7 @@ define i32 @add(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @sub(i32, i32) #0 {
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -32,7 +32,7 @@ define i32 @sub(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
+define i32 @apply(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -47,7 +47,7 @@ define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 (i32, i32)* @bar(i32 (i32, i32)*) #0 {
+define i32 (i32, i32)* @bar(i32 (i32, i32)* %0) #0 {
   %2 = alloca i32 (i32, i32)*, align 8
   store i32 (i32, i32)* %0, i32 (i32, i32)** %2, align 8
   %3 = load i32 (i32, i32)*, i32 (i32, i32)** %2, align 8
@@ -55,26 +55,7 @@ define i32 (i32, i32)* @bar(i32 (i32, i32)*) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo1(i32 (i32, i32)*, i32, i32) #0 {
-  %4 = alloca i32 (i32, i32)*, align 8
-  %5 = alloca i32, align 4
-  %6 = alloca i32, align 4
-  %7 = alloca i32 (i32, i32)*, align 8
-  store i32 (i32, i32)* %0, i32 (i32, i32)** %4, align 8
-  store i32 %1, i32* %5, align 4
-  store i32 %2, i32* %6, align 4
-  %8 = load i32 (i32, i32)*, i32 (i32, i32)** %4, align 8
-  %9 = call i32 (i32, i32)* @bar(i32 (i32, i32)* %8)
-  store i32 (i32, i32)* %9, i32 (i32, i32)** %7, align 8
-  %10 = load i32 (i32, i32)*, i32 (i32, i32)** %7, align 8
-  %11 = load i32, i32* %5, align 4
-  %12 = load i32, i32* %6, align 4
-  %13 = call i32 @apply(i32 (i32, i32)* %10, i32 %11, i32 %12)
-  ret i32 %13
-}
-
-; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo2(i32 (i32, i32)*, i32, i32) #0 {
+define i32 @foo(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -98,9 +79,9 @@ define i32 @main() #0 {
   %2 = alloca i32, align 4
   %3 = alloca i32, align 4
   store i32 0, i32* %1, align 4
-  %4 = call i32 @foo1(i32 (i32, i32)* @add, i32 2, i32 5)
+  %4 = call i32 @foo(i32 (i32, i32)* @add, i32 2, i32 5)
   store i32 %4, i32* %2, align 4
-  %5 = call i32 @foo2(i32 (i32, i32)* @sub, i32 5, i32 7)
+  %5 = call i32 @foo(i32 (i32, i32)* @sub, i32 5, i32 7)
   store i32 %5, i32* %3, align 4
   %6 = load i32, i32* %2, align 4
   %7 = load i32, i32* %3, align 4
@@ -108,11 +89,18 @@ define i32 @main() #0 {
   ret i32 %8
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_8.ll b/tests/complete_callgraph_8.ll
index 84c1f423..b30d1f0f 100644
--- a/tests/complete_callgraph_8.ll
+++ b/tests/complete_callgraph_8.ll
@@ -2,15 +2,15 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_8.dot %T/complete_callgraph_8.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_8.bc'
+; ModuleID = 'complete_callgraph_8.c'
 source_filename = "complete_callgraph_8.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.class_t = type { {}*, {}* }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo(%struct.class_t*, i32) #0 {
+define i32 @foo(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -20,7 +20,7 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   %7 = icmp sgt i32 %6, 10
   br i1 %7, label %8, label %13
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load %struct.class_t*, %struct.class_t** %4, align 8
   %10 = load i32, i32* %5, align 4
   %11 = add nsw i32 %10, 1
@@ -28,18 +28,18 @@ define i32 @foo(%struct.class_t*, i32) #0 {
   store i32 %12, i32* %3, align 4
   br label %15
 
-; <label>:13:                                     ; preds = %2
+13:                                               ; preds = %2
   %14 = load i32, i32* %5, align 4
   store i32 %14, i32* %3, align 4
   br label %15
 
-; <label>:15:                                     ; preds = %13, %8
+15:                                               ; preds = %13, %8
   %16 = load i32, i32* %3, align 4
   ret i32 %16
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @bar(%struct.class_t*, i32) #0 {
+define i32 @bar(%struct.class_t* %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca %struct.class_t*, align 8
   %5 = alloca i32, align 4
@@ -49,7 +49,7 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   %7 = icmp slt i32 %6, 100
   br i1 %7, label %8, label %13
 
-; <label>:8:                                      ; preds = %2
+8:                                                ; preds = %2
   %9 = load i32, i32* %5, align 4
   %10 = load %struct.class_t*, %struct.class_t** %4, align 8
   %11 = call i32 @foo(%struct.class_t* %10, i32 10)
@@ -57,13 +57,13 @@ define i32 @bar(%struct.class_t*, i32) #0 {
   store i32 %12, i32* %3, align 4
   br label %16
 
-; <label>:13:                                     ; preds = %2
+13:                                               ; preds = %2
   %14 = load i32, i32* %5, align 4
   %15 = sub nsw i32 %14, 5
   store i32 %15, i32* %3, align 4
   br label %16
 
-; <label>:16:                                     ; preds = %13, %8
+16:                                               ; preds = %13, %8
   %17 = load i32, i32* %3, align 4
   ret i32 %17
 }
@@ -88,11 +88,18 @@ define i32 @main() #0 {
   ret i32 0
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/complete_callgraph_9.ll b/tests/complete_callgraph_9.ll
index 4cf21168..06119c50 100644
--- a/tests/complete_callgraph_9.ll
+++ b/tests/complete_callgraph_9.ll
@@ -2,13 +2,14 @@
 ; RUN: %cmp-graphs %tests/complete_callgraph_9.dot %T/complete_callgraph_9.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-; ModuleID = 'complete_callgraph_9.bc'
-source_filename = "../tests/c/complete_callgraph_9.c"
-target datalayout = "e-m:o-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.14.0"
+
+; ModuleID = 'complete_callgraph_9.c'
+source_filename = "complete_callgraph_9.c"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @add(i32, i32) #0 {
+define i32 @add(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -20,7 +21,7 @@ define i32 @add(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @sub(i32, i32) #0 {
+define i32 @sub(i32 %0, i32 %1) #0 {
   %3 = alloca i32, align 4
   %4 = alloca i32, align 4
   store i32 %0, i32* %3, align 4
@@ -32,7 +33,7 @@ define i32 @sub(i32, i32) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
+define i32 @apply(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -43,7 +44,7 @@ define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
   %8 = load i32, i32* %5, align 4
   %9 = load i32, i32* %6, align 4
   %10 = call i32 %7(i32 %8, i32 %9)
-  %11 = call i32 (i32, i32)* (...) @nd_binfptr()
+  %11 = call i32 (i32, i32)* bitcast (i32 (i32, i32)* (...)* @nd_binfptr to i32 (i32, i32)* ()*)()
   %12 = load i32, i32* %5, align 4
   %13 = load i32, i32* %6, align 4
   %14 = call i32 %11(i32 %12, i32 %13)
@@ -54,7 +55,7 @@ define i32 @apply(i32 (i32, i32)*, i32, i32) #0 {
 declare i32 (i32, i32)* @nd_binfptr(...) #1
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 (i32, i32)* @bar(i32 (i32, i32)*) #0 {
+define i32 (i32, i32)* @bar(i32 (i32, i32)* %0) #0 {
   %2 = alloca i32 (i32, i32)*, align 8
   store i32 (i32, i32)* %0, i32 (i32, i32)** %2, align 8
   %3 = load i32 (i32, i32)*, i32 (i32, i32)** %2, align 8
@@ -62,7 +63,7 @@ define i32 (i32, i32)* @bar(i32 (i32, i32)*) #0 {
 }
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
-define i32 @foo(i32 (i32, i32)*, i32, i32) #0 {
+define i32 @foo(i32 (i32, i32)* %0, i32 %1, i32 %2) #0 {
   %4 = alloca i32 (i32, i32)*, align 8
   %5 = alloca i32, align 4
   %6 = alloca i32, align 4
@@ -96,12 +97,19 @@ define i32 @main() #0 {
   ret i32 %8
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+fxsr,+mmx,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 5.0.0 (tags/RELEASE_500/final)"}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/issue93_alias.ll b/tests/issue93_alias.ll
index 3c0ee135..a7aa801d 100644
--- a/tests/issue93_alias.ll
+++ b/tests/issue93_alias.ll
@@ -4,14 +4,14 @@
 
 ; ModuleID = 'issue93.c'
 source_filename = "issue93.c"
-target datalayout = "e-m:e-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-unknown-linux-gnu"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
-@incr = dso_local alias i32 (i32), i32 (i32)* @__incr
-@decr = dso_local alias i32 (i32), i32 (i32)* @__decr
+@incr = global i32 (i32)* @__incr, align 8
+@decr = global i32 (i32)* @__decr, align 8
 
-; Function Attrs: noinline nounwind optnone uwtable
-define dso_local i32 @__incr(i32 %0) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @__incr(i32 %0) #0 {
   %2 = alloca i32, align 4
   store i32 %0, i32* %2, align 4
   %3 = load i32, i32* %2, align 4
@@ -20,8 +20,8 @@ define dso_local i32 @__incr(i32 %0) #0 {
   ret i32 %4
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define dso_local i32 @__decr(i32 %0) #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @__decr(i32 %0) #0 {
   %2 = alloca i32, align 4
   store i32 %0, i32* %2, align 4
   %3 = load i32, i32* %2, align 4
@@ -30,8 +30,8 @@ define dso_local i32 @__decr(i32 %0) #0 {
   ret i32 %4
 }
 
-; Function Attrs: noinline nounwind optnone uwtable
-define dso_local i32 @main() #0 {
+; Function Attrs: noinline nounwind optnone ssp uwtable
+define i32 @main() #0 {
   %1 = alloca i32, align 4
   %2 = alloca i32 (i32)*, align 8
   %3 = alloca i32, align 4
@@ -41,34 +41,41 @@ define dso_local i32 @main() #0 {
   store i32 1, i32* %4, align 4
   %5 = load i32, i32* %4, align 4
   %6 = icmp sgt i32 %5, 0
-  br i1 %6, label %7, label %8
+  br i1 %6, label %7, label %9
 
 7:                                                ; preds = %0
-  store i32 (i32)* @incr, i32 (i32)** %2, align 8
-  br label %9
+  %8 = load i32 (i32)*, i32 (i32)** @incr, align 8
+  store i32 (i32)* %8, i32 (i32)** %2, align 8
+  br label %11
 
-8:                                                ; preds = %0
-  store i32 (i32)* @decr, i32 (i32)** %2, align 8
-  br label %9
+9:                                                ; preds = %0
+  %10 = load i32 (i32)*, i32 (i32)** @decr, align 8
+  store i32 (i32)* %10, i32 (i32)** %2, align 8
+  br label %11
 
-
-9:                                                ; preds = %8, %7
-  %10 = load i32 (i32)*, i32 (i32)** %2, align 8
-  %11 = load i32, i32* %3, align 4
-  %12 = call i32 %10(i32 %11)
-  store i32 %12, i32* %3, align 4
+11:                                               ; preds = %9, %7
+  %12 = load i32 (i32)*, i32 (i32)** %2, align 8
   %13 = load i32, i32* %3, align 4
-  %14 = icmp eq i32 %13, 2
-  %15 = zext i1 %14 to i32
-  ret i32 %15
+  %14 = call i32 %12(i32 %13)
+  store i32 %14, i32* %3, align 4
+  %15 = load i32, i32* %3, align 4
+  %16 = icmp eq i32 %15, 2
+  %17 = zext i1 %16 to i32
+  ret i32 %17
 }
 
-attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vec\
-tor-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target\
--cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
 
-!llvm.module.flags = !{!0}
-!llvm.ident = !{!1}
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
 
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{!"clang version 10.0.0 "}
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
diff --git a/tests/issue97.ll b/tests/issue97.ll
index e0f9ab54..ec154546 100644
--- a/tests/issue97.ll
+++ b/tests/issue97.ll
@@ -2,11 +2,10 @@
 ; RUN: %cmp-graphs %tests/issue97.callgraph.dot %T/issue97.ll/callgraph.dot | OutputCheck %s -d --comment=";"
 ; CHECK: ^OK$
 
-
 ; ModuleID = 'issue97.c'
 source_filename = "issue97.c"
-target datalayout = "e-m:o-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-apple-macosx10.15.0"
+target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
+target triple = "arm64-apple-macosx13.0.0"
 
 %struct.command = type { i8*, void (...)*, i8 }
 
@@ -14,7 +13,7 @@ target triple = "x86_64-apple-macosx10.15.0"
 @global = global i8* null, align 8
 @.str = private unnamed_addr constant [3 x i8] c"c1\00", align 1
 @.str.1 = private unnamed_addr constant [3 x i8] c"c2\00", align 1
-@commands = constant [2 x %struct.command] [%struct.command { i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i32 0, i32 0), void (...)* bitcast (void ()* @c1 to void (...)*), i8 0 }, %struct.command { i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str.1, i32 0, i32 0), void (...)* bitcast (void ()* @c2 to void (...)*), i8 1 }], align 16
+@commands = constant [2 x %struct.command] [%struct.command { i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str, i32 0, i32 0), void (...)* bitcast (void ()* @c1 to void (...)*), i8 0 }, %struct.command { i8* getelementptr inbounds ([3 x i8], [3 x i8]* @.str.1, i32 0, i32 0), void (...)* bitcast (void ()* @c2 to void (...)*), i8 1 }], align 8
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
 define void @parse_input(i8* %0) #0 {
@@ -24,10 +23,10 @@ define void @parse_input(i8* %0) #0 {
   store i32 0, i32* %3, align 4
   br label %4
 
-4:                                                ; preds = %33, %1
+4:                                                ; preds = %34, %1
   %5 = load i32, i32* %3, align 4
   %6 = icmp slt i32 %5, 2
-  br i1 %6, label %7, label %36
+  br i1 %6, label %7, label %37
 
 7:                                                ; preds = %4
   %8 = load i32, i32* %3, align 4
@@ -38,7 +37,7 @@ define void @parse_input(i8* %0) #0 {
   %13 = load i8*, i8** %2, align 8
   %14 = call i32 @strcmp(i8* %12, i8* %13) #3
   %15 = icmp eq i32 %14, 0
-  br i1 %15, label %16, label %32
+  br i1 %15, label %16, label %33
 
 16:                                               ; preds = %7
   %17 = load i32, i32* @state, align 4
@@ -49,7 +48,7 @@ define void @parse_input(i8* %0) #0 {
   %22 = load i8, i8* %21, align 8
   %23 = sext i8 %22 to i32
   %24 = icmp sge i32 %17, %23
-  br i1 %24, label %25, label %31
+  br i1 %24, label %25, label %32
 
 25:                                               ; preds = %16
   %26 = load i32, i32* %3, align 4
@@ -57,26 +56,27 @@ define void @parse_input(i8* %0) #0 {
   %28 = getelementptr inbounds [2 x %struct.command], [2 x %struct.command]* @commands, i64 0, i64 %27
   %29 = getelementptr inbounds %struct.command, %struct.command* %28, i32 0, i32 1
   %30 = load void (...)*, void (...)** %29, align 8
-  call void (...) %30()
-  br label %36
-
-31:                                               ; preds = %16
-  br label %32
+  %31 = bitcast void (...)* %30 to void ()*
+  call void %31()
+  br label %37
 
-32:                                               ; preds = %31, %7
+32:                                               ; preds = %16
   br label %33
 
-33:                                               ; preds = %32
-  %34 = load i32, i32* %3, align 4
-  %35 = add nsw i32 %34, 1
-  store i32 %35, i32* %3, align 4
-  br label %4
+33:                                               ; preds = %32, %7
+  br label %34
 
-36:                                               ; preds = %25, %4
+34:                                               ; preds = %33
+  %35 = load i32, i32* %3, align 4
+  %36 = add nsw i32 %35, 1
+  store i32 %36, i32* %3, align 4
+  br label %4, !llvm.loop !10
+
+37:                                               ; preds = %25, %4
   ret void
 }
 
-; Function Attrs: nounwind readonly
+; Function Attrs: nocallback nounwind readonly willreturn
 declare i32 @strcmp(i8*, i8*) #1
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
@@ -111,10 +111,10 @@ define void @c1() #0 {
   ret void
 }
 
-; Function Attrs: nounwind
+; Function Attrs: nocallback nounwind
 declare noalias i8* @malloc(i32) #2
 
-; Function Attrs: nounwind
+; Function Attrs: nocallback nounwind
 declare void @free(i8*) #2
 
 ; Function Attrs: noinline nounwind optnone ssp uwtable
@@ -155,15 +155,24 @@ define i32 @main() #0 {
   ret i32 0
 }
 
-attributes #0 = { noinline nounwind optnone ssp uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { nounwind readonly "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #2 = { nounwind "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="all" "less-precise-fpmad"="false" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="penryn" "target-features"="+cx16,+cx8,+fxsr,+mmx,+sahf,+sse,+sse2,+sse3,+sse4.1,+ssse3,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #3 = { nounwind readonly }
-attributes #4 = { nounwind }
-
-!llvm.module.flags = !{!0, !1}
-!llvm.ident = !{!2}
-
-!0 = !{i32 1, !"wchar_size", i32 4}
-!1 = !{i32 7, !"PIC Level", i32 2}
-!2 = !{!"clang version 10.0.0 "}
+attributes #0 = { noinline nounwind optnone ssp uwtable "frame-pointer"="non-leaf" "min-legal-vector-width"="0" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #1 = { nocallback nounwind readonly willreturn "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #2 = { nocallback nounwind "frame-pointer"="non-leaf" "no-trapping-math"="true" "probe-stack"="__chkstk_darwin" "stack-protector-buffer-size"="8" "target-cpu"="apple-m1" "target-features"="+aes,+crc,+crypto,+dotprod,+fp-armv8,+fp16fml,+fullfp16,+lse,+neon,+ras,+rcpc,+rdm,+sha2,+sha3,+sm4,+v8.5a,+zcm,+zcz" }
+attributes #3 = { nocallback nounwind readonly willreturn }
+attributes #4 = { nocallback nounwind }
+
+!llvm.module.flags = !{!0, !1, !2, !3, !4, !5, !6, !7, !8}
+!llvm.ident = !{!9}
+
+!0 = !{i32 2, !"SDK Version", [2 x i32] [i32 13, i32 1]}
+!1 = !{i32 1, !"wchar_size", i32 4}
+!2 = !{i32 1, !"branch-target-enforcement", i32 0}
+!3 = !{i32 1, !"sign-return-address", i32 0}
+!4 = !{i32 1, !"sign-return-address-all", i32 0}
+!5 = !{i32 1, !"sign-return-address-with-bkey", i32 0}
+!6 = !{i32 7, !"PIC Level", i32 2}
+!7 = !{i32 7, !"uwtable", i32 1}
+!8 = !{i32 7, !"frame-pointer", i32 1}
+!9 = !{!"Apple clang version 14.0.0 (clang-1400.0.29.202)"}
+!10 = distinct !{!10, !11}
+!11 = !{!"llvm.loop.mustprogress"}