Code review + add test

Cellule · Cellule · commit 3dd461de9b1c · 2017-01-18T16:00:04.000-08:00
diff --git a/lib/Common/Common/MathUtil.h b/lib/Common/Common/MathUtil.h
@@ -45,7 +45,7 @@ class Math
 
     static bool     FitsInDWord(int32 value) { return true; }
     static bool     FitsInDWord(size_t value) { return ((size_t)(signed int)(value & 0xFFFFFFFF) == value); }
-    static bool     FitsInDWord(int64 value) { return FitsInDWord((size_t)value); }
+    static bool     FitsInDWord(int64 value) { return ((int64)(signed int)(value & 0xFFFFFFFF) == value); }
 
     static UINT_PTR Rand();
     static bool     IsPow2(int32 val) { return (val > 0 && ((val-1) & val) == 0); }
diff --git a/test/wasm/binaries/bug_fitsdword.wasm b/test/wasm/binaries/bug_fitsdword.wasm
diff --git a/test/wasm/bugs.js b/test/wasm/bugs.js
@@ -0,0 +1,11 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft Corporation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+WScript.Flag("-wasmI64");
+async function main() {
+  const {instance: {exports: {foo}}} = await WebAssembly.instantiate(readbuffer("binaries/bug_fitsdword.wasm"));
+  foo();
+}
+
+main().then(() => console.log("PASSED"), console.log);
diff --git a/test/wasm/rlexe.xml b/test/wasm/rlexe.xml
@@ -128,6 +128,12 @@
     <compile-flags>-wasm</compile-flags>
   </default>
 </test>
+<test>
+  <default>
+    <files>bugs.js</files>
+    <compile-flags>-wasm</compile-flags>
+  </default>
+</test>
 <test>
   <default>
     <files>debugger.js</files>
diff --git a/test/wasm/wasts/bug_fitsdword.wast b/test/wasm/wasts/bug_fitsdword.wast
@@ -0,0 +1,7 @@
+;;-------------------------------------------------------------------------------------------------------
+;; Copyright (C) Microsoft. All rights reserved.
+;; Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+;;-------------------------------------------------------------------------------------------------------
+(module
+  (func (export "foo") (result i64) (i64.extend_u/i32 (i32.const 0x80000000)))
+)
