Use C++17's [[maybe_unused]]. NFC (WebAssembly#2089)

ludoplex · Dec 2, 2022 · 978193b · 978193b
1 parent f6bc569
commit 978193b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 13 deletions.
diff --git a/src/c-writer.cc b/src/c-writer.cc
@@ -601,7 +601,7 @@ void CWriter::DefineImportName(const Import* import,
   import_syms_.insert(name);
   import_module_sym_map_.emplace(name, import->module_name);
   global_syms_.insert(mangled);
-  bool success WABT_UNUSED =
+  [[maybe_unused]] bool success =
       global_sym_map_.emplace(name + MangleField(type), mangled).second;
   assert(success);
 }
@@ -610,14 +610,15 @@ std::string CWriter::DefineGlobalScopeName(ModuleFieldType type,
                                            std::string_view name) {
   std::string mangled = std::string(name) + MangleField(type);
   std::string unique = DefineName(&global_syms_, StripLeadingDollar(name));
-  bool success WABT_UNUSED = global_sym_map_.emplace(mangled, unique).second;
+  [[maybe_unused]] bool success =
+      global_sym_map_.emplace(mangled, unique).second;
   assert(success);
   return unique;
 }
 
 std::string CWriter::DefineLocalScopeName(std::string_view name) {
   std::string unique = DefineName(&local_syms_, StripLeadingDollar(name));
-  bool success WABT_UNUSED = local_sym_map_.emplace(name, unique).second;
+  [[maybe_unused]] bool success = local_sym_map_.emplace(name, unique).second;
   assert(success);
   return unique;
 }
@@ -627,7 +628,8 @@ std::string CWriter::DefineStackVarName(Index index,
                                         std::string_view name) {
   std::string unique = DefineName(&local_syms_, name);
   StackTypePair stp = {index, type};
-  bool success WABT_UNUSED = stack_var_sym_map_.emplace(stp, unique).second;
+  [[maybe_unused]] bool success =
+      stack_var_sym_map_.emplace(stp, unique).second;
   assert(success);
   return unique;
 }

diff --git a/src/config.h.in b/src/config.h.in
@@ -66,7 +66,6 @@
 
 #if COMPILER_IS_CLANG || COMPILER_IS_GNU
 
-#define WABT_UNUSED __attribute__((unused))
 #define WABT_WARN_UNUSED __attribute__((warn_unused_result))
 #define WABT_INLINE inline
 #define WABT_UNLIKELY(x) __builtin_expect(!!(x), 0)
@@ -86,15 +85,8 @@
 #endif
 
 #ifdef __cplusplus
-#if __cplusplus >= 201103L
 #define WABT_STATIC_ASSERT(x) static_assert((x), #x)
 #else
-#define WABT_STATIC_ASSERT__(x, c) \
-  static int static_assert_##c[(x ? 0 : -1)] WABT_UNUSED
-#define WABT_STATIC_ASSERT_(x, c) WABT_STATIC_ASSERT__(x, c)
-#define WABT_STATIC_ASSERT(x) WABT_STATIC_ASSERT_(x, __COUNTER__)
-#endif
-#else
 #define WABT_STATIC_ASSERT(x) _Static_assert((x), #x)
 #endif
 
@@ -103,7 +95,6 @@
 #include <intrin.h>
 #include <string.h>
 
-#define WABT_UNUSED
 #define WABT_WARN_UNUSED
 #define WABT_INLINE __inline
 #define WABT_STATIC_ASSERT(x) _STATIC_ASSERT(x)