summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/s2wasm.h6
-rw-r--r--src/tools/wasm2asm.cpp2
2 files changed, 4 insertions, 4 deletions
diff --git a/src/s2wasm.h b/src/s2wasm.h
index dd507143b..634aa43e5 100644
--- a/src/s2wasm.h
+++ b/src/s2wasm.h
@@ -915,7 +915,7 @@ class S2WasmBuilder {
curr->align = curr->bytes;
if (attributes[0]) {
assert(strncmp(attributes[0], "p2align=", 8) == 0);
- curr->align = 1U << getInt(attributes[0] + 8);
+ curr->align = Address(1) << getInt(attributes[0] + 8);
}
setOutput(curr, assign);
};
@@ -938,7 +938,7 @@ class S2WasmBuilder {
curr->align = curr->bytes;
if (attributes[0]) {
assert(strncmp(attributes[0], "p2align=", 8) == 0);
- curr->align = 1U << getInt(attributes[0] + 8);
+ curr->align = Address(1) << getInt(attributes[0] + 8);
}
curr->value = inputs[1];
curr->finalize();
@@ -1430,7 +1430,7 @@ class S2WasmBuilder {
Address localAlign = 1;
if (*s == ',') {
skipComma();
- localAlign = 1 << getInt();
+ localAlign = Address(1) << getInt();
}
linkerObj->addStatic(size, std::max(align, localAlign), name);
}
diff --git a/src/tools/wasm2asm.cpp b/src/tools/wasm2asm.cpp
index 5c331f4c3..4198c8784 100644
--- a/src/tools/wasm2asm.cpp
+++ b/src/tools/wasm2asm.cpp
@@ -80,7 +80,7 @@ int main(int argc, const char *argv[]) {
} catch (ParseException& p) {
p.dump(std::cerr);
Fatal() << "error in parsing input";
- } catch (std::bad_alloc& b) {
+ } catch (std::bad_alloc&) {
Fatal() << "error in building module, std::bad_alloc (possibly invalid request for silly amounts of memory)";
}