luo980/cpptrace
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Attempt to fix line number differences in test traces

Browse Source
This commit is contained in:
Jeremy 2023-07-04 08:53:04 -04:00
parent 323aeebe3e
commit c73af83e23
No known key found for this signature in database
GPG Key ID: 19AA8270105E8EB4
5 changed files with 106 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
test/expected/clang.txt
View File

@ -1,27 +1,27 @@
test/test.cpp||18||trace() test/test.cpp||18||trace()
test/test.cpp||31||foo(int) test/test.cpp||34||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||39||void foo<int>(int, int) test/test.cpp||46||void foo<int>(int, int)
test/test.cpp||39||void foo<int, int>(int, int, int) test/test.cpp||46||void foo<int, int>(int, int, int)
test/test.cpp||39||void foo<int, int, int>(int, int, int, int) test/test.cpp||46||void foo<int, int, int>(int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int>(int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int>(int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int>(int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int>(int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int>(int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int>(int, int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int)
test/test.cpp||43||function_two(int, float) test/test.cpp||52||function_two(int, float)
test/test.cpp||47||function_one(int) test/test.cpp||58||function_one(int)
test/test.cpp||51||main test/test.cpp||64||main
../csu/libc-start.c||308||__libc_start_main ../csu/libc-start.c||308||__libc_start_main
||0|| ||0||_start
||0|| ||0||

48
test/expected/gcc.txt
View File

@ -1,27 +1,27 @@
test/test.cpp||18||trace() test/test.cpp||18||trace()
test/test.cpp||31||foo(int) test/test.cpp||34||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||33||foo(int) test/test.cpp||38||foo(int)
test/test.cpp||39||void foo<int>(int, int) test/test.cpp||46||void foo<int>(int, int)
test/test.cpp||39||void foo<int, int>(int, int, int) test/test.cpp||46||void foo<int, int>(int, int, int)
test/test.cpp||39||void foo<int, int, int>(int, int, int, int) test/test.cpp||46||void foo<int, int, int>(int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int>(int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int>(int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int>(int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int>(int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int>(int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int>(int, int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int)
test/test.cpp||39||void foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int) test/test.cpp||46||void foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int)
test/test.cpp||43||function_two(int, float) test/test.cpp||52||function_two(int, float)
test/test.cpp||47||function_one(int) test/test.cpp||58||function_one(int)
test/test.cpp||51||main test/test.cpp||64||main
../csu/libc-start.c||308||__libc_start_main ../csu/libc-start.c||308||__libc_start_main
||0|| ||0||_start
||0|| ||0||

44
test/expected/windows_clang.txt
View File

@ -1,27 +1,27 @@
test\test.cpp||18||trace() test\test.cpp||18||trace()
test\test.cpp||32||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||35||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||40||foo<int>(int, int) test\test.cpp||39||foo(int)
test\test.cpp||40||foo<int, int>(int, int, int) test\test.cpp||47||foo<int>(int, int)
test\test.cpp||40||foo<int, int, int>(int, int, int, int) test\test.cpp||47||foo<int, int>(int, int, int)
test\test.cpp||40||foo<int, int, int, int>(int, int, int, int, int) test\test.cpp||47||foo<int, int, int>(int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int>(int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int>(int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int>(int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int>(int, int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int, int>(int, int, int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int)
test\test.cpp||44||function_two(int, float) test\test.cpp||47||foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int)
test\test.cpp||48||function_one(int) test\test.cpp||53||function_two(int, float)
test\test.cpp||52||main() test\test.cpp||59||function_one(int)
test\test.cpp||65||main()
D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||79||invoke_main() D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||79||invoke_main()
D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||288||__scrt_common_main_seh() D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||288||__scrt_common_main_seh()
D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||331||__scrt_common_main() D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||331||__scrt_common_main()

44
test/expected/windows_msvc.txt
View File

@ -1,27 +1,27 @@
test\test.cpp||18||trace() test\test.cpp||18||trace()
test\test.cpp||32||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||35||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||35||foo(int) test\test.cpp||39||foo(int)
test\test.cpp||40||foo<int>(int, int) test\test.cpp||39||foo(int)
test\test.cpp||40||foo<int, int>(int, int, int) test\test.cpp||47||foo<int>(int, int)
test\test.cpp||40||foo<int, int, int>(int, int, int, int) test\test.cpp||47||foo<int, int>(int, int, int)
test\test.cpp||40||foo<int, int, int, int>(int, int, int, int, int) test\test.cpp||47||foo<int, int, int>(int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int>(int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int>(int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int>(int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int>(int, int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int, int>(int, int, int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int)
test\test.cpp||40||foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int) test\test.cpp||47||foo<int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int)
test\test.cpp||44||function_two(int, float) test\test.cpp||47||foo<int, int, int, int, int, int, int, int, int>(int, int, int, int, int, int, int, int, int, int)
test\test.cpp||48||function_one(int) test\test.cpp||53||function_two(int, float)
test\test.cpp||52||main() test\test.cpp||59||function_one(int)
test\test.cpp||65||main()
D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||79||invoke_main() D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||79||invoke_main()
D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||288||__scrt_common_main_seh() D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||288||__scrt_common_main_seh()
D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||331||__scrt_common_main() D:\a\_work\1\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl||331||__scrt_common_main()

14
test/test.cpp
View File

@ -26,27 +26,41 @@ void trace() {
} }
} }
int x;
void foo(int n) { void foo(int n) {
if(n == 0) { if(n == 0) {
x = 0;
trace(); trace();
x = 0;
} else { } else {
x = 0;
foo(n - 1); foo(n - 1);
x = 0;
} }
} }
template<typename... Args> template<typename... Args>
void foo(int x, Args... args) { void foo(int x, Args... args) {
x = 0;
foo(args...); foo(args...);
x = 0;
} }
void function_two(int, float) { void function_two(int, float) {
x = 0;
foo(1, 2, 3, 4, 5, 6, 7, 8, 9, 10); foo(1, 2, 3, 4, 5, 6, 7, 8, 9, 10);
x = 0;
} }
void function_one(int) { void function_one(int) {
x = 0;
function_two(0, 0); function_two(0, 0);
x = 0;
} }
int main() { int main() {
x = 0;
function_one(0); function_one(0);
x = 0;
} }