Respond to review

WebAssembly · Nov 11, 2024 · 70556e4 · 70556e4
1 parent 7bea8ee
commit 70556e4
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 8 deletions.
diff --git a/src/prebuilt/wasm2c_source_declarations.cc b/src/prebuilt/wasm2c_source_declarations.cc
@@ -169,14 +169,18 @@ R"w2c_template(
 )w2c_template"
 R"w2c_template(#define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
 )w2c_template"
-R"w2c_template(#else /* MSVC */
+R"w2c_template(#elif defined(MSVC)
 )w2c_template"
 R"w2c_template(static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
 )w2c_template"
 R"w2c_template(  return _addcarry_u64(0, a, b, resptr);
 )w2c_template"
 R"w2c_template(}
 )w2c_template"
+R"w2c_template(#else
+)w2c_template"
+R"w2c_template(#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
+)w2c_template"
 R"w2c_template(#endif
 )w2c_template"
 R"w2c_template(

diff --git a/src/template/wasm2c.declarations.c b/src/template/wasm2c.declarations.c
@@ -91,10 +91,12 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a,
 
 #if __has_builtin(__builtin_add_overflow)
 #define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
-#else /* MSVC */
+#elif defined(MSVC)
 static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
   return _addcarry_u64(0, a, b, resptr);
 }
+#else
+#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
 #endif
 
 #define RANGE_CHECK(mem, offset, len)              \

diff --git a/test/wasm2c/add.txt b/test/wasm2c/add.txt
@@ -158,10 +158,12 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a,
 
 #if __has_builtin(__builtin_add_overflow)
 #define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
-#else /* MSVC */
+#elif defined(MSVC)
 static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
   return _addcarry_u64(0, a, b, resptr);
 }
+#else
+#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
 #endif
 
 #define RANGE_CHECK(mem, offset, len)              \

diff --git a/test/wasm2c/check-imports.txt b/test/wasm2c/check-imports.txt
@@ -182,10 +182,12 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a,
 
 #if __has_builtin(__builtin_add_overflow)
 #define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
-#else /* MSVC */
+#elif defined(MSVC)
 static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
   return _addcarry_u64(0, a, b, resptr);
 }
+#else
+#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
 #endif
 
 #define RANGE_CHECK(mem, offset, len)              \

diff --git a/test/wasm2c/export-names.txt b/test/wasm2c/export-names.txt
@@ -182,10 +182,12 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a,
 
 #if __has_builtin(__builtin_add_overflow)
 #define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
-#else /* MSVC */
+#elif defined(MSVC)
 static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
   return _addcarry_u64(0, a, b, resptr);
 }
+#else
+#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
 #endif
 
 #define RANGE_CHECK(mem, offset, len)              \

diff --git a/test/wasm2c/hello.txt b/test/wasm2c/hello.txt
@@ -190,10 +190,12 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a,
 
 #if __has_builtin(__builtin_add_overflow)
 #define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
-#else /* MSVC */
+#elif defined(MSVC)
 static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
   return _addcarry_u64(0, a, b, resptr);
 }
+#else
+#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
 #endif
 
 #define RANGE_CHECK(mem, offset, len)              \

diff --git a/test/wasm2c/minimal.txt b/test/wasm2c/minimal.txt
@@ -152,10 +152,12 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a,
 
 #if __has_builtin(__builtin_add_overflow)
 #define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
-#else /* MSVC */
+#elif defined(MSVC)
 static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
   return _addcarry_u64(0, a, b, resptr);
 }
+#else
+#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
 #endif
 
 #define RANGE_CHECK(mem, offset, len)              \

diff --git a/test/wasm2c/tail-calls.txt b/test/wasm2c/tail-calls.txt
@@ -182,10 +182,12 @@ static inline bool func_types_eq(const wasm_rt_func_type_t a,
 
 #if __has_builtin(__builtin_add_overflow)
 #define add_overflow(a, b, resptr) __builtin_add_overflow(a, b, resptr)
-#else /* MSVC */
+#elif defined(MSVC)
 static inline bool add_overflow(uint64_t a, uint64_t b, uint64_t* resptr) {
   return _addcarry_u64(0, a, b, resptr);
 }
+#else
+#error "Missing implementation of __builtin_add_overflow or _addcarry_u64"
 #endif
 
 #define RANGE_CHECK(mem, offset, len)              \