Hide addresses in tracing test (#58)

PhilippGrulich · web-flow · commit 0d38c259822c · 2024-10-08T13:32:13.000+02:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -73,7 +73,7 @@ jobs:
       - name: cmake
         shell: bash
         run: |
-          cmake -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache ${{ matrix.flags }}  -G Ninja -S . -B .
+          cmake -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -DLOGGING_HIDE_ADDRESSES=ON -D CMAKE_CXX_COMPILER_LAUNCHER=ccache ${{ matrix.flags }}  -G Ninja -S . -B .
       - name: build
         shell: bash
         run: |
diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml
@@ -40,7 +40,7 @@ jobs:
       - name: cmake
         shell: bash
         run: |
-          cmake -DCMAKE_BUILD_TYPE=Release -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache ${{ matrix.flags }}  -G Ninja -S . -B .
+          cmake -DCMAKE_BUILD_TYPE=Release -DLOGGING_HIDE_ADDRESSES=ON -D CMAKE_C_COMPILER_LAUNCHER=ccache -D CMAKE_CXX_COMPILER_LAUNCHER=ccache ${{ matrix.flags }}  -G Ninja -S . -B .
       - name: build
         shell: bash
         run: |
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -15,6 +15,7 @@ cmake_dependent_option(NAUTILUS_DOWNLOAD_MLIR "USE_PRE_BUILD_MLIR" ON "ENABLE_ML
 cmake_dependent_option(ENABLE_C_BACKEND "Enable the C compiler backend" ON "ENABLE_COMPILER" OFF)
 cmake_dependent_option(ENABLE_BC_BACKEND "Enable the bytecode interpreter backend" ON "ENABLE_COMPILER" OFF)
 cmake_dependent_option(ENABLE_ASMJIT_BACKEND "Enable the asmjit interpreter backend" OFF "ENABLE_COMPILER" OFF)
+option(LOGGING_HIDE_ADDRESSES "Enable logging of addresses (disable for testing)" OFF)
 
 option(ENABLE_TEST_COVERAGE "Enable the collection of test coverage." OFF)
 option(ENABLE_ADDRESS_SANITIZER "Enable address sanitizer." OFF)
diff --git a/nautilus/include/nautilus/common/config.h.in b/nautilus/include/nautilus/common/config.h.in
@@ -10,4 +10,5 @@
 #cmakedefine TEST_DATA_FOLDER "@TEST_DATA_FOLDER@"
 
 // Backends
-#cmakedefine NAUTILUS_ACTIVATE_MLIR_BACKEND
+#cmakedefine NAUTILUS_ACTIVATE_MLIR_BACKEND
+#cmakedefine LOGGING_HIDE_ADDRESSES
diff --git a/nautilus/src/nautilus/compiler/ir/IRDumpHandler.cpp b/nautilus/src/nautilus/compiler/ir/IRDumpHandler.cpp
diff --git a/nautilus/src/nautilus/compiler/ir/IRDumpHandler.hpp b/nautilus/src/nautilus/compiler/ir/IRDumpHandler.hpp
diff --git a/nautilus/src/nautilus/compiler/ir/IRGraph.cpp b/nautilus/src/nautilus/compiler/ir/IRGraph.cpp
@@ -164,7 +164,11 @@ struct formatter<nautilus::compiler::ir::ProxyCallOperation> : formatter<std::st
 		if (op.getStamp() != nautilus::Type::v) {
 			fmt::format_to(out, "${} = ", op.getIdentifier().getId());
 		}
-		fmt::format_to(out, "{}(", op.getFunctionName());
+#ifdef LOGGING_HIDE_ADDRESSES
+			fmt::format_to(out, "func_*(");
+#else
+			fmt::format_to(out, "{}(", op.getFunctionName());
+#endif
 		const auto& args = op.getInputArguments();
 		for (size_t i = 0; i < args.size(); ++i) {
 			if (i > 0) {
diff --git a/nautilus/src/nautilus/tracing/ExecutionTrace.cpp b/nautilus/src/nautilus/tracing/ExecutionTrace.cpp
@@ -3,6 +3,7 @@
 #include "nautilus/tracing/symbolic_execution/TraceTerminationException.hpp"
 #include <algorithm>
 #include <fmt/format.h>
+#include <nautilus/config.hpp>
 
 namespace nautilus::tracing {
 
@@ -333,7 +334,11 @@ template <>
 struct formatter<nautilus::tracing::FunctionCall> : formatter<std::string_view> {
 	static auto format(const nautilus::tracing::FunctionCall& call, format_context& ctx) -> format_context::iterator {
 		auto out = ctx.out();
+#ifdef LOGGING_HIDE_ADDRESSES
+		fmt::format_to(out, "func_*(");
+#else
 		fmt::format_to(out, "{}(", call.functionName);
+#endif
 		for (size_t i = 0; i < call.arguments.size(); i++) {
 			if (i != 0) {
 				fmt::format_to(out, ",");
diff --git a/nautilus/test/data/enum-tests/after_ssa/callEnumClassFunction.trace b/nautilus/test/data/enum-tests/after_ssa/callEnumClassFunction.trace
@@ -1,3 +1,3 @@
 B0($1:ui8)
-	CALL	$2	_ZN8nautilus17enumClassFunctionENS_8LogLevelE($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/enum-tests/after_ssa/callEnumFunction.trace b/nautilus/test/data/enum-tests/after_ssa/callEnumFunction.trace
@@ -1,3 +1,3 @@
 B0($1:ui32)
-	CALL	$2	_ZN8nautilus12enumFunctionENS_5ColorE($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/enum-tests/ir/callEnumClassFunction.trace b/nautilus/test/data/enum-tests/ir/callEnumClassFunction.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:ui8):
-	$2 = _ZN8nautilus17enumClassFunctionENS_8LogLevelE($1) :i32
+	$2 = func_*($1) :i32
 	return ($2) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/enum-tests/ir/callEnumFunction.trace b/nautilus/test/data/enum-tests/ir/callEnumFunction.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:ui32):
-	$2 = _ZN8nautilus12enumFunctionENS_5ColorE($1) :i32
+	$2 = func_*($1) :i32
 	return ($2) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/enum-tests/tracing/callEnumClassFunction.trace b/nautilus/test/data/enum-tests/tracing/callEnumClassFunction.trace
@@ -1,3 +1,3 @@
 B0($1:ui8)
-	CALL	$2	_ZN8nautilus17enumClassFunctionENS_8LogLevelE($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/enum-tests/tracing/callEnumFunction.trace b/nautilus/test/data/enum-tests/tracing/callEnumFunction.trace
@@ -1,3 +1,3 @@
 B0($1:ui32)
-	CALL	$2	_ZN8nautilus12enumFunctionENS_5ColorE($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/after_ssa/callMemcpy.trace b/nautilus/test/data/pointer-tests/after_ssa/callMemcpy.trace
@@ -1,4 +1,4 @@
 B0($1:ptr,$2:ptr)
 	CONST	$3	0	:ui64
-	CALL	$4	_ZZN8nautilus6memcpyENS_3valIPvEENS0_IPKvEENS0_ImEEEN3$_08__invokeES1_S4_m($2,$1,$3)	:ptr
+	CALL	$4	func_*($2,$1,$3)	:ptr
 	RETURN	$0	:void
diff --git a/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace b/nautilus/test/data/pointer-tests/after_ssa/castCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/after_ssa/passCustomClass.trace b/nautilus/test/data/pointer-tests/after_ssa/passCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15passCustomClassENS_3valIPNS_11CustomClassEEEEN3$_08__invokeES2_($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/after_ssa/specializeType.trace b/nautilus/test/data/pointer-tests/after_ssa/specializeType.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/after_ssa/useWrapper.trace b/nautilus/test/data/pointer-tests/after_ssa/useWrapper.trace
@@ -1,5 +1,5 @@
 B0($1:ptr,$2:ptr)
-	CALL	$3	_ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($1)	:i32
-	CALL	$4	_ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($2)	:i32
+	CALL	$3	func_*($1)	:i32
+	CALL	$4	func_*($2)	:i32
 	ADD	$5	$3	$4	:i32
 	RETURN	$0	$5	:i32
diff --git a/nautilus/test/data/pointer-tests/ir/callMemcpy.trace b/nautilus/test/data/pointer-tests/ir/callMemcpy.trace
@@ -2,7 +2,7 @@ NautilusIr {
 execute() {
 Block_0($1:ptr, $2:ptr):
 	$3 = 0 :ui64
-	$4 = _ZZN8nautilus6memcpyENS_3valIPvEENS0_IPKvEENS0_ImEEEN3$_08__invokeES1_S4_m($2,$1,$3) :ptr
+	$4 = func_*($2,$1,$3) :ptr
 	return :void
 }
 } //NESIR
diff --git a/nautilus/test/data/pointer-tests/ir/castCustomClass.trace b/nautilus/test/data/pointer-tests/ir/castCustomClass.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:ptr):
-	$2 = _ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1) :i32
+	$2 = func_*($1) :i32
 	return ($2) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/pointer-tests/ir/passCustomClass.trace b/nautilus/test/data/pointer-tests/ir/passCustomClass.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:ptr):
-	$2 = _ZZN8nautilus15passCustomClassENS_3valIPNS_11CustomClassEEEEN3$_08__invokeES2_($1) :i32
+	$2 = func_*($1) :i32
 	return ($2) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/pointer-tests/ir/specializeType.trace b/nautilus/test/data/pointer-tests/ir/specializeType.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:ptr):
-	$2 = _ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($1) :i32
+	$2 = func_*($1) :i32
 	return ($2) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/pointer-tests/ir/useWrapper.trace b/nautilus/test/data/pointer-tests/ir/useWrapper.trace
@@ -1,8 +1,8 @@
 NautilusIr {
 execute() {
 Block_0($1:ptr, $2:ptr):
-	$3 = _ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($1) :i32
-	$4 = _ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($2) :i32
+	$3 = func_*($1) :i32
+	$4 = func_*($2) :i32
 	$5 = $3 + $4 :i32
 	return ($5) :i32
 }
diff --git a/nautilus/test/data/pointer-tests/tracing/callMemcpy.trace b/nautilus/test/data/pointer-tests/tracing/callMemcpy.trace
@@ -1,4 +1,4 @@
 B0($1:ptr,$2:ptr)
 	CONST	$3	0	:ui64
-	CALL	$4	_ZZN8nautilus6memcpyENS_3valIPvEENS0_IPKvEENS0_ImEEEN3$_08__invokeES1_S4_m($2,$1,$3)	:ptr
+	CALL	$4	func_*($2,$1,$3)	:ptr
 	RETURN	$0	:void
diff --git a/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace b/nautilus/test/data/pointer-tests/tracing/castCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15castCustomClassENS_3valIPNS_9BaseClassEEEEN3$_18__invokeEPNS_11CustomClassE($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/tracing/passCustomClass.trace b/nautilus/test/data/pointer-tests/tracing/passCustomClass.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus15passCustomClassENS_3valIPNS_11CustomClassEEEEN3$_08__invokeES2_($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/tracing/specializeType.trace b/nautilus/test/data/pointer-tests/tracing/specializeType.trace
@@ -1,3 +1,3 @@
 B0($1:ptr)
-	CALL	$2	_ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/pointer-tests/tracing/useWrapper.trace b/nautilus/test/data/pointer-tests/tracing/useWrapper.trace
@@ -1,5 +1,5 @@
 B0($1:ptr,$2:ptr)
-	CALL	$3	_ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($1)	:i32
-	CALL	$4	_ZZN8nautilus3valIPNS_13CustomStruct2EE4getXEvENUlS2_E_8__invokeES2_($2)	:i32
+	CALL	$3	func_*($1)	:i32
+	CALL	$4	func_*($2)	:i32
 	ADD	$5	$3	$4	:i32
 	RETURN	$0	$5	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/callSameFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/callSameFunction.trace
@@ -1,4 +1,4 @@
 B0($1:i32)
-	CALL	$2	_ZN8nautilus6engine3addEii($1,$1)	:i32
-	CALL	$3	_ZN8nautilus6engine3addEii($2,$2)	:i32
+	CALL	$2	func_*($1,$1)	:i32
+	CALL	$3	func_*($2,$2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/callTwoFunctions.trace b/nautilus/test/data/runtime-call-tests/after_ssa/callTwoFunctions.trace
@@ -1,5 +1,5 @@
 B0($1:i32,$2:i32)
-	CALL	$3	_ZN8nautilus6engine3addEii($1,$2)	:i32
-	CALL	$4	_ZN8nautilus6engine3subEii($1,$2)	:i32
+	CALL	$3	func_*($1,$2)	:i32
+	CALL	$4	func_*($1,$2)	:i32
 	ADD	$5	$3	$4	:i32
 	RETURN	$0	$5	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/lambdaRuntimeFunction.trace
@@ -1,3 +1,3 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/loopDirectCall.trace b/nautilus/test/data/runtime-call-tests/after_ssa/loopDirectCall.trace
@@ -3,7 +3,7 @@ B0($1:i32,$2:i32)
 	CONST	$4	0	:i32
 	JMP	$0	B3($3,$4,$1,$2)	:void
 B1($1:i32,$4:i32,$3:i32,$2:i32)
-	CALL	$7	_ZN8nautilus6engine3addEii($3,$2)	:i32
+	CALL	$7	func_*($3,$2)	:i32
 	CONST	$8	1	:i32
 	ADD	$9	$4	$8	:i32
 	JMP	$0	B3($7,$9,$1,$2)	:void
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/after_ssa/nestedLambdaRuntimeFunction.trace
@@ -1,4 +1,4 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1)	:i32
-	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2)	:i32
+	CALL	$2	func_*($1)	:i32
+	CALL	$3	func_*($2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/simpleDirectCall.trace b/nautilus/test/data/runtime-call-tests/after_ssa/simpleDirectCall.trace
@@ -1,3 +1,3 @@
 B0($1:i32,$2:i32)
-	CALL	$3	_ZN8nautilus6engine3addEii($1,$2)	:i32
+	CALL	$3	func_*($1,$2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/data/runtime-call-tests/after_ssa/voidFuncCall.trace b/nautilus/test/data/runtime-call-tests/after_ssa/voidFuncCall.trace
@@ -1,3 +1,3 @@
 B0($1:i32,$2:i32)
-	CALL	$3	_ZN8nautilus6engine8voidFuncEii($1,$2)	:void
+	CALL	$3	func_*($1,$2)	:void
 	RETURN	$0	$1	:i32
diff --git a/nautilus/test/data/runtime-call-tests/ir/callSameFunction.trace b/nautilus/test/data/runtime-call-tests/ir/callSameFunction.trace
@@ -1,8 +1,8 @@
 NautilusIr {
 execute() {
 Block_0($1:i32):
-	$2 = _ZN8nautilus6engine3addEii($1,$1) :i32
-	$3 = _ZN8nautilus6engine3addEii($2,$2) :i32
+	$2 = func_*($1,$1) :i32
+	$3 = func_*($2,$2) :i32
 	return ($3) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/runtime-call-tests/ir/callTwoFunctions.trace b/nautilus/test/data/runtime-call-tests/ir/callTwoFunctions.trace
@@ -1,8 +1,8 @@
 NautilusIr {
 execute() {
 Block_0($1:i32, $2:i32):
-	$3 = _ZN8nautilus6engine3addEii($1,$2) :i32
-	$4 = _ZN8nautilus6engine3subEii($1,$2) :i32
+	$3 = func_*($1,$2) :i32
+	$4 = func_*($1,$2) :i32
 	$5 = $3 + $4 :i32
 	return ($5) :i32
 }
diff --git a/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/lambdaRuntimeFunction.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:i32):
-	$2 = _ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1) :i32
+	$2 = func_*($1) :i32
 	return ($2) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/runtime-call-tests/ir/loopDirectCall.trace b/nautilus/test/data/runtime-call-tests/ir/loopDirectCall.trace
@@ -10,7 +10,7 @@ Block_3($3:i32, $4:i32, $1:i32, $2:i32):
 	if $5 ? Block_1($1, $4, $3, $2) : Block_2($3) :void
 
 Block_1($1:i32, $4:i32, $3:i32, $2:i32):
-	$7 = _ZN8nautilus6engine3addEii($3,$2) :i32
+	$7 = func_*($3,$2) :i32
 	$8 = 1 :i32
 	$9 = $4 + $8 :i32
 	br Block_3($7, $9, $1, $2) :void
diff --git a/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/ir/nestedLambdaRuntimeFunction.trace
@@ -1,8 +1,8 @@
 NautilusIr {
 execute() {
 Block_0($1:i32):
-	$2 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1) :i32
-	$3 = _ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2) :i32
+	$2 = func_*($1) :i32
+	$3 = func_*($2) :i32
 	return ($3) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/runtime-call-tests/ir/simpleDirectCall.trace b/nautilus/test/data/runtime-call-tests/ir/simpleDirectCall.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:i32, $2:i32):
-	$3 = _ZN8nautilus6engine3addEii($1,$2) :i32
+	$3 = func_*($1,$2) :i32
 	return ($3) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/runtime-call-tests/ir/voidFuncCall.trace b/nautilus/test/data/runtime-call-tests/ir/voidFuncCall.trace
@@ -1,7 +1,7 @@
 NautilusIr {
 execute() {
 Block_0($1:i32, $2:i32):
-	_ZN8nautilus6engine8voidFuncEii($1,$2) :void
+	func_*($1,$2) :void
 	return ($1) :i32
 }
 } //NESIR
diff --git a/nautilus/test/data/runtime-call-tests/tracing/callSameFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/callSameFunction.trace
@@ -1,6 +1,6 @@
 B0($1:i32)
-	CALL	$2	_ZN8nautilus6engine3addEii($1,$1)	:i32
+	CALL	$2	func_*($1,$1)	:i32
 	ASSIGN	$1	$2	:i32
-	CALL	$3	_ZN8nautilus6engine3addEii($1,$1)	:i32
+	CALL	$3	func_*($1,$1)	:i32
 	ASSIGN	$1	$3	:i32
 	RETURN	$0	$1	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/callTwoFunctions.trace b/nautilus/test/data/runtime-call-tests/tracing/callTwoFunctions.trace
@@ -1,5 +1,5 @@
 B0($1:i32,$2:i32)
-	CALL	$3	_ZN8nautilus6engine3addEii($1,$2)	:i32
-	CALL	$4	_ZN8nautilus6engine3subEii($1,$2)	:i32
+	CALL	$3	func_*($1,$2)	:i32
+	CALL	$4	func_*($1,$2)	:i32
 	ADD	$5	$3	$4	:i32
 	RETURN	$0	$5	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/lambdaRuntimeFunction.trace
@@ -1,3 +1,3 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine21lambdaRuntimeFunctionENS_3valIiEEEN3$_28__invokeEi($1)	:i32
+	CALL	$2	func_*($1)	:i32
 	RETURN	$0	$2	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/loopDirectCall.trace b/nautilus/test/data/runtime-call-tests/tracing/loopDirectCall.trace
@@ -3,7 +3,7 @@ B0($1:i32,$2:i32)
 	CONST	$4	0	:i32
 	JMP	$0	B3()	:void
 B1()
-	CALL	$7	_ZN8nautilus6engine3addEii($3,$2)	:i32
+	CALL	$7	func_*($3,$2)	:i32
 	ASSIGN	$3	$7	:i32
 	CONST	$8	1	:i32
 	ADD	$9	$4	$8	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace b/nautilus/test/data/runtime-call-tests/tracing/nestedLambdaRuntimeFunction.trace
@@ -1,4 +1,4 @@
 B0($1:i32)
-	CALL	$2	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_48__invokeEi($1)	:i32
-	CALL	$3	_ZZN8nautilus6engine27nestedLambdaRuntimeFunctionENS_3valIiEEEN3$_38__invokeEi($2)	:i32
+	CALL	$2	func_*($1)	:i32
+	CALL	$3	func_*($2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/simpleDirectCall.trace b/nautilus/test/data/runtime-call-tests/tracing/simpleDirectCall.trace
@@ -1,3 +1,3 @@
 B0($1:i32,$2:i32)
-	CALL	$3	_ZN8nautilus6engine3addEii($1,$2)	:i32
+	CALL	$3	func_*($1,$2)	:i32
 	RETURN	$0	$3	:i32
diff --git a/nautilus/test/data/runtime-call-tests/tracing/voidFuncCall.trace b/nautilus/test/data/runtime-call-tests/tracing/voidFuncCall.trace
@@ -1,3 +1,3 @@
 B0($1:i32,$2:i32)
-	CALL	$3	_ZN8nautilus6engine8voidFuncEii($1,$2)	:void
+	CALL	$3	func_*($1,$2)	:void
 	RETURN	$0	$1	:i32
diff --git a/nautilus/test/execution-tests/CMakeLists.txt b/nautilus/test/execution-tests/CMakeLists.txt
@@ -14,7 +14,7 @@ list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
 
 catch_discover_tests(nautilus-execution-tests EXTRA_ARGS --allow-running-no-tests)
 
-if (ENABLE_TRACING AND (CMAKE_CXX_COMPILER_ID STREQUAL "AppleClang"))
+if (ENABLE_TRACING AND (CMAKE_CXX_COMPILER_ID MATCHES "Clang"))
     # using Clang
     add_executable(nautilus-tracing-tests
             TracingTest.cpp

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`NautilusIr {`
`2`	`2`	`execute() {`
`3`	`3`	`Block_0($1:ui8):`
`4`		`- $2 = _ZN8nautilus17enumClassFunctionENS_8LogLevelE($1) :i32`
	`4`	`+ $2 = func_*($1) :i32`
`5`	`5`	`return ($2) :i32`
`6`	`6`	`}`
`7`	`7`	`} //NESIR`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@ NautilusIr {`
`2`	`2`	`execute() {`
`3`	`3`	`Block_0($1:ptr, $2:ptr):`
`4`	`4`	`$3 = 0 :ui64`
`5`		`- $4 = _ZZN8nautilus6memcpyENS_3valIPvEENS0_IPKvEENS0_ImEEEN3$_08__invokeES1_S4_m($2,$1,$3) :ptr`
	`5`	`+ $4 = func_*($2,$1,$3) :ptr`
`6`	`6`	`return :void`
`7`	`7`	`}`
`8`	`8`	`} //NESIR`