commit eae6b35a5d6522b4cfddef1c507f40598e8161b8
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 04 01:06:37 2016 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Wed May 04 01:06:37 2016 +0000
tree b802d1f5d69c545673695c0697118150f8055af5
parent b5dad35e00d5c1018eedadc9b3f5d2d3a8837ae6

Fix the ENABLE(WEBASSEMBLY) build
https://bugs.webkit.org/show_bug.cgi?id=157312

Patch by Xan Lopez <xlopez@igalia.com> on 2016-05-03
Reviewed by Darin Adler.

* runtime/Executable.cpp:
(JSC::WebAssemblyExecutable::WebAssemblyExecutable):
* wasm/WASMFunctionCompiler.h:
(JSC::WASMFunctionCompiler::convertValueToDouble):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@200399 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Source/JavaScriptCore/ChangeLog

diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index 4e62be4..ef28f50 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,15 @@
+2016-05-03  Xan Lopez  <xlopez@igalia.com>
+
+        Fix the ENABLE(WEBASSEMBLY) build
+        https://bugs.webkit.org/show_bug.cgi?id=157312
+
+        Reviewed by Darin Adler.
+
+        * runtime/Executable.cpp:
+        (JSC::WebAssemblyExecutable::WebAssemblyExecutable):
+        * wasm/WASMFunctionCompiler.h:
+        (JSC::WASMFunctionCompiler::convertValueToDouble):
+
 2016-05-03  Joseph Pecoraro  <pecoraro@apple.com>
 
         Web Inspector: Remove unused parameter of ScriptArguments::getFirstArgumentAsString

Source/JavaScriptCore/runtime/Executable.cpp

diff --git a/Source/JavaScriptCore/runtime/Executable.cpp b/Source/JavaScriptCore/runtime/Executable.cpp
index 04aa318..4fb958c 100644
--- a/Source/JavaScriptCore/runtime/Executable.cpp
+++ b/Source/JavaScriptCore/runtime/Executable.cpp
@@ -734,7 +734,7 @@
 const ClassInfo WebAssemblyExecutable::s_info = { "WebAssemblyExecutable", &ExecutableBase::s_info, 0, CREATE_METHOD_TABLE(WebAssemblyExecutable) };
 
 WebAssemblyExecutable::WebAssemblyExecutable(VM& vm, const SourceCode& source, JSWASMModule* module, unsigned functionIndex)
-    : ExecutableBase(vm, vm.webAssemblyExecutableStructure.get(), NUM_PARAMETERS_NOT_COMPILED)
+    : ExecutableBase(vm, vm.webAssemblyExecutableStructure.get(), NUM_PARAMETERS_NOT_COMPILED, NoIntrinsic)
     , m_source(source)
     , m_module(vm, this, module)
     , m_functionIndex(functionIndex)

Source/JavaScriptCore/wasm/WASMFunctionCompiler.h

diff --git a/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h b/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h
index de439ba..0f2f015 100644
--- a/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h
+++ b/Source/JavaScriptCore/wasm/WASMFunctionCompiler.h
@@ -1471,7 +1471,7 @@
         end.append(jump());
 
         checkJSNumber.link(this);
-        unboxDoubleWithoutAssertions(valueRegs.gpr(), dst);
+        unboxDoubleWithoutAssertions(valueRegs.gpr(), scratch, dst);
         end.link(this);
     }
 #else