Use a class with implicit overflow checks for Address (#486)

It includes implicit conversion from u64 and implicit conversion to address_t. This makes it easier to use without ugly casting and but still gets the overflow checks.

1 files changed, 2 insertions, 4 deletions

diff --git a/src/wasm-linker.h b/src/wasm-linker.h
index 41c0f3c7e..5fe01b393 100644
--- a/src/wasm-linker.h
+++ b/src/wasm-linker.h
@@ -100,14 +100,12 @@ class LinkerObject {
 
   // Add an initializer segment for the named static variable.
   void addSegment(Name name, const char* data, Address size) {
-    assert(wasm.memory.segments.size() < std::numeric_limits<Address>::max());
-    segments[name] = static_cast<Address>(wasm.memory.segments.size());
+    segments[name] = wasm.memory.segments.size();
     wasm.memory.segments.emplace_back(0, data, size);
   }
 
   void addSegment(Name name, std::vector<char>& data) {
-    assert(wasm.memory.segments.size() < std::numeric_limits<Address>::max());
-    segments[name] = static_cast<Address>(wasm.memory.segments.size());
+    segments[name] = wasm.memory.segments.size();
     wasm.memory.segments.emplace_back(0, data);
   }