summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/wabt/base-types.h6
-rw-r--r--include/wabt/binary.h2
-rw-r--r--include/wabt/circular-array.h2
-rw-r--r--include/wabt/common.h6
-rw-r--r--include/wabt/interp/interp.h8
-rw-r--r--include/wabt/interp/istream.h4
-rw-r--r--include/wabt/ir.h2
-rw-r--r--include/wabt/opcode.h6
-rw-r--r--include/wabt/wast-lexer.h2
-rw-r--r--src/binary-writer.cc2
-rw-r--r--src/test-hexfloat.cc2
11 files changed, 21 insertions, 21 deletions
diff --git a/include/wabt/base-types.h b/include/wabt/base-types.h
index 37c8e111..b89fd447 100644
--- a/include/wabt/base-types.h
+++ b/include/wabt/base-types.h
@@ -26,9 +26,9 @@ typedef uint32_t Index; // An index into one of the many index spaces.
typedef uint64_t Address; // An address or size in linear memory.
typedef size_t Offset; // An offset into a host's file or memory buffer.
-static const Address kInvalidAddress = ~0;
-static const Index kInvalidIndex = ~0;
-static const Offset kInvalidOffset = ~0;
+constexpr Address kInvalidAddress = ~0;
+constexpr Index kInvalidIndex = ~0;
+constexpr Offset kInvalidOffset = ~0;
} // namespace wabt
diff --git a/include/wabt/binary.h b/include/wabt/binary.h
index a5740c89..485f15cb 100644
--- a/include/wabt/binary.h
+++ b/include/wabt/binary.h
@@ -65,7 +65,7 @@ enum class BinarySection {
Last = Tag,
};
/* clang-format on */
-static const int kBinarySectionCount = WABT_ENUM_COUNT(BinarySection);
+constexpr int kBinarySectionCount = WABT_ENUM_COUNT(BinarySection);
enum class BinarySectionOrder {
#define V(Name, name, code) Name,
diff --git a/include/wabt/circular-array.h b/include/wabt/circular-array.h
index afdead77..217a72b2 100644
--- a/include/wabt/circular-array.h
+++ b/include/wabt/circular-array.h
@@ -103,7 +103,7 @@ class CircularArray {
}
private:
- static const size_type kMask = kCapacity - 1;
+ static constexpr size_type kMask = kCapacity - 1;
size_t position(size_t index) const { return (front_ + index) & kMask; }
diff --git a/include/wabt/common.h b/include/wabt/common.h
index a8d492ef..04793d7e 100644
--- a/include/wabt/common.h
+++ b/include/wabt/common.h
@@ -204,7 +204,7 @@ enum class LabelType {
First = Func,
Last = Catch,
};
-static const int kLabelTypeCount = WABT_ENUM_COUNT(LabelType);
+constexpr int kLabelTypeCount = WABT_ENUM_COUNT(LabelType);
struct Location {
enum class Type {
@@ -291,7 +291,7 @@ enum class RelocType {
First = FuncIndexLEB,
Last = MemoryAddressTLSI32,
};
-static const int kRelocTypeCount = WABT_ENUM_COUNT(RelocType);
+constexpr int kRelocTypeCount = WABT_ENUM_COUNT(RelocType);
struct Reloc {
Reloc(RelocType, size_t offset, Index index, int32_t addend = 0);
@@ -365,7 +365,7 @@ enum class ExternalKind {
First = Func,
Last = Tag,
};
-static const int kExternalKindCount = WABT_ENUM_COUNT(ExternalKind);
+constexpr int kExternalKindCount = WABT_ENUM_COUNT(ExternalKind);
struct Limits {
Limits() = default;
diff --git a/include/wabt/interp/interp.h b/include/wabt/interp/interp.h
index 6d4a6a01..bb3cf487 100644
--- a/include/wabt/interp/interp.h
+++ b/include/wabt/interp/interp.h
@@ -96,7 +96,7 @@ enum class ObjectKind {
Last = Instance,
};
-static const int kCommandTypeCount = WABT_ENUM_COUNT(ObjectKind);
+constexpr int kCommandTypeCount = WABT_ENUM_COUNT(ObjectKind);
const char* GetName(Mutability);
const std::string GetName(ValueType);
@@ -119,7 +119,7 @@ using RefVec = std::vector<Ref>;
template <typename T, u8 L>
struct Simd {
using LaneType = T;
- static const u8 lanes = L;
+ static constexpr u8 lanes = L;
T v[L];
@@ -1086,8 +1086,8 @@ enum class RunResult {
class Thread {
public:
struct Options {
- static const u32 kDefaultValueStackSize = 64 * 1024 / sizeof(Value);
- static const u32 kDefaultCallStackSize = 64 * 1024 / sizeof(Frame);
+ static constexpr u32 kDefaultValueStackSize = 64 * 1024 / sizeof(Value);
+ static constexpr u32 kDefaultCallStackSize = 64 * 1024 / sizeof(Frame);
u32 value_stack_size = kDefaultValueStackSize;
u32 call_stack_size = kDefaultCallStackSize;
diff --git a/include/wabt/interp/istream.h b/include/wabt/interp/istream.h
index 06e1cfca..f8eb6a26 100644
--- a/include/wabt/interp/istream.h
+++ b/include/wabt/interp/istream.h
@@ -95,7 +95,7 @@ class Istream {
public:
using SerializedOpcode = u32; // TODO: change to u16
using Offset = u32;
- static const Offset kInvalidOffset = ~0;
+ static constexpr Offset kInvalidOffset = ~0;
// Each br_table entry is made up of three instructions:
//
// interp_drop_keep $drop $keep
@@ -103,7 +103,7 @@ class Istream {
// br $label
//
// Each opcode is a SerializedOpcode, and each immediate is a u32.
- static const Offset kBrTableEntrySize =
+ static constexpr Offset kBrTableEntrySize =
sizeof(SerializedOpcode) * 3 + 4 * sizeof(u32);
// Emit API.
diff --git a/include/wabt/ir.h b/include/wabt/ir.h
index 6bd9ffa3..ac79ecbb 100644
--- a/include/wabt/ir.h
+++ b/include/wabt/ir.h
@@ -1320,7 +1320,7 @@ enum class CommandType {
First = Module,
Last = AssertException,
};
-static const int kCommandTypeCount = WABT_ENUM_COUNT(CommandType);
+constexpr int kCommandTypeCount = WABT_ENUM_COUNT(CommandType);
class Command {
public:
diff --git a/include/wabt/opcode.h b/include/wabt/opcode.h
index 24b45ab6..47e27f9b 100644
--- a/include/wabt/opcode.h
+++ b/include/wabt/opcode.h
@@ -91,9 +91,9 @@ struct Opcode {
bool IsInvalid() const { return enum_ >= Invalid; }
private:
- static const uint32_t kMathPrefix = 0xfc;
- static const uint32_t kThreadsPrefix = 0xfe;
- static const uint32_t kSimdPrefix = 0xfd;
+ static constexpr uint32_t kMathPrefix = 0xfc;
+ static constexpr uint32_t kThreadsPrefix = 0xfe;
+ static constexpr uint32_t kSimdPrefix = 0xfd;
struct Info {
const char* name;
diff --git a/include/wabt/wast-lexer.h b/include/wabt/wast-lexer.h
index 23ee5ea9..a88889ab 100644
--- a/include/wabt/wast-lexer.h
+++ b/include/wabt/wast-lexer.h
@@ -56,7 +56,7 @@ class WastLexer {
}
private:
- static const int kEof = -1;
+ static constexpr int kEof = -1;
enum class CharClass { IdChar = 1, Keyword = 2, HexDigit = 4, Digit = 8 };
Location GetLocation();
diff --git a/src/binary-writer.cc b/src/binary-writer.cc
index 93db5b19..41b682a7 100644
--- a/src/binary-writer.cc
+++ b/src/binary-writer.cc
@@ -96,7 +96,7 @@ namespace {
/* TODO(binji): better leb size guess. Some sections we know will only be 1
byte, but others we can be fairly certain will be larger. */
-static const size_t LEB_SECTION_SIZE_GUESS = 1;
+constexpr size_t LEB_SECTION_SIZE_GUESS = 1;
#define ALLOC_FAILURE \
fprintf(stderr, "%s:%d: allocation failed\n", __FILE__, __LINE__)
diff --git a/src/test-hexfloat.cc b/src/test-hexfloat.cc
index 6dba8c06..d732c992 100644
--- a/src/test-hexfloat.cc
+++ b/src/test-hexfloat.cc
@@ -67,7 +67,7 @@ static bool is_infinity_or_nan(uint64_t double_bits) {
class ThreadedTest : public ::testing::Test {
protected:
- static const int kDefaultNumThreads = 2;
+ static constexpr int kDefaultNumThreads = 2;
virtual void SetUp() {
num_threads_ = std::thread::hardware_concurrency();
generated by cgit v1.2.3 (git 2.39.1) at 2025-08-06 07:52:39 +0000