llvm-project
ef1a2ff1 - Unbreak macOS builds broken by #183310 (#191899)

Commit
11 days ago
Unbreak macOS builds broken by #183310 (#191899) Revert "[TySan][Sanitizer Common] Make TySan compatible with sanitizer common… (#183310)" and "[TySan][Sanitizer Common] Enable TySan testing in the sanitizer commo… (#191385)" This reverts commit d043b9e38dd9494c3c56018b2cbaf44fe205b110 and dd0c5ebe69e580066de100c8c2ba5430a1aeee44. d043b9e38dd9494c3c56018b2cbaf44fe205b110 broke the macOS bots https://ci.swift.org/job/llvm.org/job/clang-stage1-RA-cmake-incremental/job/main/638/consoleFull#-1919712802f80d942a-f672-4696-b0d9-c66cae8aa9dd with an error that looks like: ``` /Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/llvm-project/compiler-rt/lib/tysan/../sanitizer_common/sanitizer_signal_interceptors.inc:136:3: error: expected expression 136 | INIT_SIGNAL; | ^ /Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/llvm-project/compiler-rt/lib/tysan/../sanitizer_common/sanitizer_signal_interceptors.inc:77:21: note: expanded from macro 'INIT_SIGNAL' 77 | #define INIT_SIGNAL COMMON_INTERCEPT_FUNCTION(signal) | ^ /Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/llvm-project/compiler-rt/lib/tysan/tysan_interceptors.cpp:51:41: note: expanded from macro 'COMMON_INTERCEPT_FUNCTION' 51 | #define COMMON_INTERCEPT_FUNCTION(name) TYSAN_INTERCEPT_FUNC(name) | ^ /Users/ec2-user/jenkins/workspace/llvm.org/as-lldb-cmake/llvm-project/compiler-rt/lib/tysan/tysan_interceptors.cpp:27:34: note: expanded from macro 'TYSAN_INTERCEPT_FUNC' 27 | if (!INTERCEPT_FUNCTION(name)) ``` unfortunately reverting just d043b9e38dd9494c3c56018b2cbaf44fe205b110 doesn't work cleanly because another commit (dd0c5ebe69e580066de100c8c2ba5430a1aeee44) enabled testing and the testing fails when we revert just d043b9e38dd9494c3c56018b2cbaf44fe205b110. So this commit reverts dd0c5ebe69e580066de100c8c2ba5430a1aeee44 too. It would've been nice to have to separate revert commits but it seems GitHub won't let me do this and forces commits to be squashed. rdar://174648152
Author
Parents
Loading