diff options
| author | JF Bastien <github@jfbastien.com> | 2016-05-03 14:05:44 -0700 |
|---|---|---|
| committer | JF Bastien <github@jfbastien.com> | 2016-05-03 14:05:44 -0700 |
| commit | b6ec3620376a8b9cf7cedfe7f61fd4c943e0275b (patch) | |
| tree | 635a4938c01a235747c6b76cd364ca223e74e540 | |
| parent | 09153904803c628393a8ff65c1791d3bc57c756b (diff) | |
| download | binaryen-b6ec3620376a8b9cf7cedfe7f61fd4c943e0275b.tar.gz binaryen-b6ec3620376a8b9cf7cedfe7f61fd4c943e0275b.tar.bz2 binaryen-b6ec3620376a8b9cf7cedfe7f61fd4c943e0275b.zip | |
Fix shift UB (#429)
Getting close to finishing #404.
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | src/wasm.h | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index 93a0e7e26..b98a0040d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,7 @@ matrix: sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6'] packages: ['cmake', 'nodejs', 'clang-3.6'] - - env: COMPILER_VERSION=3.6 COMPILER_FLAGS="-fsanitize=undefined -fno-sanitize-recover=null,alignment,bool,bounds,enum,float-cast-overflow,float-divide-by-zero,function,integer-divide-by-zero,nonnull-attribute,object-size,return,returns-nonnull-attribute,unreachable,unsigned-integer-overflow,vla-bound,vptr -fsanitize-blacklist=`pwd`/ubsan.blacklist" + - env: COMPILER_VERSION=3.6 COMPILER_FLAGS="-fsanitize=undefined -fno-sanitize-recover=shift,null,alignment,bool,bounds,enum,float-cast-overflow,float-divide-by-zero,function,integer-divide-by-zero,nonnull-attribute,object-size,return,returns-nonnull-attribute,unreachable,unsigned-integer-overflow,vla-bound,vptr -fsanitize-blacklist=`pwd`/ubsan.blacklist" compiler: clang addons: *clang36 diff --git a/src/wasm.h b/src/wasm.h index dcad171a0..f9d0cb129 100644 --- a/src/wasm.h +++ b/src/wasm.h @@ -530,22 +530,22 @@ public: } Literal shl(const Literal& other) const { switch (type) { - case WasmType::i32: return Literal(i32 << other.i32); - case WasmType::i64: return Literal(i64 << other.i64); + case WasmType::i32: return Literal(uint32_t(i32) << (other.i32 & 0x1f)); + case WasmType::i64: return Literal(uint64_t(i64) << (other.i64 & 0x3f)); default: WASM_UNREACHABLE(); } } Literal shrS(const Literal& other) const { switch (type) { - case WasmType::i32: return Literal(i32 >> other.i32); - case WasmType::i64: return Literal(i64 >> other.i64); + case WasmType::i32: return Literal(i32 >> (other.i32 & 0x1f)); + case WasmType::i64: return Literal(i64 >> (other.i64 & 0x3f)); default: WASM_UNREACHABLE(); } } Literal shrU(const Literal& other) const { switch (type) { - case WasmType::i32: return Literal(uint32_t(i32) >> uint32_t(other.i32)); - case WasmType::i64: return Literal(uint64_t(i64) >> uint64_t(other.i64)); + case WasmType::i32: return Literal(uint32_t(i32) >> uint32_t(other.i32 & 0x1f)); + case WasmType::i64: return Literal(uint64_t(i64) >> uint64_t(other.i64 & 0x3f)); default: WASM_UNREACHABLE(); } } |