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

Heejin Ahn via cfe-commits cfe-commits at lists.llvm.org
Mon Jan 15 20:08:44 PST 2024


https://github.com/aheejin created https://github.com/llvm/llvm-project/pull/78230

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

>From 9ddfd0446342ea3c257b5d1d104f957a83c01e3c Mon Sep 17 00:00:00 2001
From: Heejin Ahn <aheejin at gmail.com>
Date: Mon, 15 Jan 2024 20:06:48 -0800
Subject: [PATCH] [libunwind][WebAssembly] Fix libunwind.cpp guard

This should have been `&&`, meaning neither SjLj nor Wasm uses this
file.
---
 libunwind/src/libunwind.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/libunwind/src/libunwind.cpp b/libunwind/src/libunwind.cpp
index cd610377b63de8..f3c32762a5954b 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