[libunwind] 4967d98 - [libunwind][WebAssembly] Fix libunwind.cpp guard (#78230)

via cfe-commits cfe-commits at lists.llvm.org
Tue Jan 16 05:48:55 PST 2024


Author: Heejin Ahn
Date: 2024-01-16T08:48:50-05:00
New Revision: 4967d98eda48bed4a6f382d240f5a33177bc654c

URL: https://github.com/llvm/llvm-project/commit/4967d98eda48bed4a6f382d240f5a33177bc654c
DIFF: https://github.com/llvm/llvm-project/commit/4967d98eda48bed4a6f382d240f5a33177bc654c.diff

LOG: [libunwind][WebAssembly] Fix libunwind.cpp guard (#78230)

This should have been `&&`, meaning neither SjLj nor Wasm uses this
file.

Added: 
    

Modified: 
    libunwind/src/libunwind.cpp

Removed: 
    


################################################################################
diff  --git a/libunwind/src/libunwind.cpp b/libunwind/src/libunwind.cpp
index 723c8ceb5c8c94..217dde90986379 100644
--- a/libunwind/src/libunwind.cpp
+++ b/libunwind/src/libunwind.cpp
@@ -26,7 +26,7 @@
 #include <sanitizer/asan_interface.h>
 #endif
 
-#if !defined(__USING_SJLJ_EXCEPTIONS__) || !defined(__USING_WASM_EXCEPTIONS__)
+#if !defined(__USING_SJLJ_EXCEPTIONS__) && !defined(__USING_WASM_EXCEPTIONS__)
 #include "AddressSpace.hpp"
 #include "UnwindCursor.hpp"
 
@@ -347,7 +347,7 @@ void __unw_remove_dynamic_eh_frame_section(unw_word_t eh_frame_start) {
 }
 
 #endif // defined(_LIBUNWIND_SUPPORT_DWARF_UNWIND)
-#endif // !defined(__USING_SJLJ_EXCEPTIONS__) ||
+#endif // !defined(__USING_SJLJ_EXCEPTIONS__) &&
        // !defined(__USING_WASM_EXCEPTIONS__)
 
 #ifdef __APPLE__


        


More information about the cfe-commits mailing list