<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"

"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">

<html xmlns="http://www.w3.org/1999/xhtml">

<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />

<title>[209560] trunk</title>

</head>

<body>

<style type="text/css"><!--

#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }

#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }

#msg dt:after { content:':';}

#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }

#msg dl a { font-weight: bold}

#msg dl a:link    { color:#fc3; }

#msg dl a:active  { color:#ff0; }

#msg dl a:visited { color:#cc6; }

h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }

#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }

#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }

#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }

#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }

#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }

#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }

#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }

#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }

#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }

#logmsg pre { background: #eee; padding: 1em; }

#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}

#logmsg dl { margin: 0; }

#logmsg dt { font-weight: bold; }

#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }

#logmsg dd:before { content:'\00bb';}

#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }

#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }

#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }

#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }

#logmsg table th.Corner { text-align: left; }

#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }

#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }

#patch { width: 100%; }

#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}

#patch .propset h4, #patch .binary h4 {margin:0;}

#patch pre {padding:0;line-height:1.2em;margin:0;}

#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}

#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}

#patch span {display:block;padding:0 10px;}

#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}

#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}

#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}

#patch .lines, .info {color:#888;background:#fff;}

--></style>

<div id="msg">

<dl class="meta">

<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/209560">209560</a></dd>

<dt>Author</dt> <dd>jfbastien@apple.com</dd>

<dt>Date</dt> <dd>2016-12-08 13:09:06 -0800 (Thu, 08 Dec 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>WebAssembly JS API: wire up Instance imports

https://bugs.webkit.org/show_bug.cgi?id=165118

Reviewed by Saam Barati.

JSTests:

* wasm/js-api/test_Instance.js: add the test, disabled for now

Source/JavaScriptCore:

Change a bunch of the WebAssembly object model, and pipe the

necessary changes to be able to call JS imports from

WebAssembly. This will make it easier to call_indirect, and

unblock many other missing features.

As a follow-up I need to teach JSC::linkFor to live without a

CodeBlock: wasm doesn't have one and the IC patching is sad. We'll

switch on the callee (or its type?) and then use that as the owner

(because the callee is alive if the instance is alive, ditto

module, and module owns the CallLinkInfo).

* CMakeLists.txt:

* JavaScriptCore.xcodeproj/project.pbxproj:

* interpreter/CallFrame.h:

(JSC::ExecState::callee): give access to the callee as a JSCell

* jit/RegisterSet.cpp: dead code from previous WebAssembly implementation

* jsc.cpp:

(callWasmFunction):

(functionTestWasmModuleFunctions):

* runtime/JSCellInlines.h:

(JSC::ExecState::vm): check callee instead of jsCallee: wasm only has a JSCell and not a JSObject

* runtime/VM.cpp:

(JSC::VM::VM): store the &quot;top&quot; WebAssembly.Instance on entry to WebAssembly (and restore the previous one on exit)

* runtime/VM.h:

* testWasm.cpp:

(runWasmTests):

* wasm/JSWebAssembly.h:

* wasm/WasmB3IRGenerator.cpp:

(JSC::Wasm::B3IRGenerator::B3IRGenerator): pass unlinked calls around to shorten their lifetime: they're ony needed until the Plan is done

(JSC::Wasm::B3IRGenerator::addCall):

(JSC::Wasm::createJSToWasmWrapper):

(JSC::Wasm::parseAndCompile): also pass in the function index space, so that imports can be signature-checked along with internal functions

* wasm/WasmB3IRGenerator.h:

* wasm/WasmBinding.cpp: Added.

(JSC::Wasm::importStubGenerator): stubs from wasm to JS

* wasm/WasmBinding.h: Copied from Source/JavaScriptCore/wasm/WasmValidate.h.

* wasm/WasmCallingConvention.h:

(JSC::Wasm::CallingConvention::setupFrameInPrologue):

* wasm/WasmFormat.h: fix the object model

(JSC::Wasm::CallableFunction::CallableFunction):

* wasm/WasmFunctionParser.h: simplify some of the failure condition checks

(JSC::Wasm::FunctionParser&lt;Context&gt;::FunctionParser): need function index space, not just internal functions

(JSC::Wasm::FunctionParser&lt;Context&gt;::parseExpression):

* wasm/WasmModuleParser.cpp: early-create some of the structures which will be needed later

(JSC::Wasm::ModuleParser::parseImport):

(JSC::Wasm::ModuleParser::parseFunction):

(JSC::Wasm::ModuleParser::parseMemory):

(JSC::Wasm::ModuleParser::parseExport):

(JSC::Wasm::ModuleParser::parseCode):

* wasm/WasmModuleParser.h:

(JSC::Wasm::ModuleParser::functionIndexSpace):

(JSC::Wasm::ModuleParser::functionLocations):

* wasm/WasmParser.h:

(JSC::Wasm::Parser::consumeUTF8String):

* wasm/WasmPlan.cpp: pass around the wasm objects at the right time, reducing their lifetime and making it easier to pass them around when needed

(JSC::Wasm::Plan::run):

(JSC::Wasm::Plan::initializeCallees):

* wasm/WasmPlan.h:

(JSC::Wasm::Plan::exports):

(JSC::Wasm::Plan::internalFunctionCount):

(JSC::Wasm::Plan::jsToWasmEntryPointForFunction):

(JSC::Wasm::Plan::takeModuleInformation):

(JSC::Wasm::Plan::takeCallLinkInfos):

(JSC::Wasm::Plan::takeWasmToJSStubs):

(JSC::Wasm::Plan::takeFunctionIndexSpace):

* wasm/WasmValidate.cpp: check function index space instead of only internal functions

(JSC::Wasm::Validate::addCall):

(JSC::Wasm::validateFunction):

* wasm/WasmValidate.h:

* wasm/js/JSWebAssemblyCallee.cpp:

(JSC::JSWebAssemblyCallee::finishCreation):

* wasm/js/JSWebAssemblyCallee.h:

(JSC::JSWebAssemblyCallee::create):

(JSC::JSWebAssemblyCallee::jsToWasmEntryPoint):

* wasm/js/JSWebAssemblyInstance.cpp:

(JSC::JSWebAssemblyInstance::create):

(JSC::JSWebAssemblyInstance::JSWebAssemblyInstance):

(JSC::JSWebAssemblyInstance::visitChildren):

* wasm/js/JSWebAssemblyInstance.h: hold the import functions off the end of the Instance

(JSC::JSWebAssemblyInstance::importFunction):

(JSC::JSWebAssemblyInstance::importFunctions):

(JSC::JSWebAssemblyInstance::setImportFunction):

(JSC::JSWebAssemblyInstance::offsetOfImportFunctions):

(JSC::JSWebAssemblyInstance::offsetOfImportFunction):

(JSC::JSWebAssemblyInstance::allocationSize):

* wasm/js/JSWebAssemblyModule.cpp:

(JSC::JSWebAssemblyModule::create):

(JSC::JSWebAssemblyModule::JSWebAssemblyModule):

(JSC::JSWebAssemblyModule::visitChildren):

* wasm/js/JSWebAssemblyModule.h: hold the link call info, the import function stubs, and the function index space

(JSC::JSWebAssemblyModule::signatureForFunctionIndexSpace):

(JSC::JSWebAssemblyModule::importCount):

(JSC::JSWebAssemblyModule::calleeFromFunctionIndexSpace):

* wasm/js/WebAssemblyFunction.cpp:

(JSC::callWebAssemblyFunction): set top Instance on VM

* wasm/js/WebAssemblyFunction.h:

(JSC::WebAssemblyFunction::instance):

* wasm/js/WebAssemblyInstanceConstructor.cpp:

(JSC::constructJSWebAssemblyInstance): handle function imports

* wasm/js/WebAssemblyModuleConstructor.cpp:

(JSC::constructJSWebAssemblyModule): generate the stubs for import functions

* wasm/js/WebAssemblyModuleRecord.cpp:

(JSC::WebAssemblyModuleRecord::link):

* wasm/js/WebAssemblyToJSCallee.cpp: Copied from Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.cpp.

(JSC::WebAssemblyToJSCallee::create): dummy JSCell singleton which lives on the VM, and is put as the callee in the import stub's frame to identified it when unwinding

(JSC::WebAssemblyToJSCallee::createStructure):

(JSC::WebAssemblyToJSCallee::WebAssemblyToJSCallee):

(JSC::WebAssemblyToJSCallee::finishCreation):

(JSC::WebAssemblyToJSCallee::destroy):

* wasm/js/WebAssemblyToJSCallee.h: Copied from Source/JavaScriptCore/wasm/WasmB3IRGenerator.h.</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>

<li><a href="#trunkJSTestswasmjsapitest_Instancejs">trunk/JSTests/wasm/js-api/test_Instance.js</a></li>

<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>

<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFrameh">trunk/Source/JavaScriptCore/interpreter/CallFrame.h</a></li>

<li><a href="#trunkSourceJavaScriptCorejitRegisterSetcpp">trunk/Source/JavaScriptCore/jit/RegisterSet.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellInlinesh">trunk/Source/JavaScriptCore/runtime/JSCellInlines.h</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeVMcpp">trunk/Source/JavaScriptCore/runtime/VM.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>

<li><a href="#trunkSourceJavaScriptCoretestWasmcpp">trunk/Source/JavaScriptCore/testWasm.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmJSWebAssemblyh">trunk/Source/JavaScriptCore/wasm/JSWebAssembly.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmB3IRGeneratorh">trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmCallingConventionh">trunk/Source/JavaScriptCore/wasm/WasmCallingConvention.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmFormath">trunk/Source/JavaScriptCore/wasm/WasmFormat.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmFunctionParserh">trunk/Source/JavaScriptCore/wasm/WasmFunctionParser.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmModuleParsercpp">trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmModuleParserh">trunk/Source/JavaScriptCore/wasm/WasmModuleParser.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmParserh">trunk/Source/JavaScriptCore/wasm/WasmParser.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmPlancpp">trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmPlanh">trunk/Source/JavaScriptCore/wasm/WasmPlan.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmValidatecpp">trunk/Source/JavaScriptCore/wasm/WasmValidate.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmValidateh">trunk/Source/JavaScriptCore/wasm/WasmValidate.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyCalleecpp">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyCalleeh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyInstancecpp">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyInstanceh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyInstance.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyModulecpp">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyModuleh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyFunctioncpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyFunctionh">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyInstanceConstructorcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyModuleConstructorcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyModuleRecordcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp</a></li>

</ul>

<h3>Added Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCorewasmWasmBindingcpp">trunk/Source/JavaScriptCore/wasm/WasmBinding.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmWasmBindingh">trunk/Source/JavaScriptCore/wasm/WasmBinding.h</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyToJSCalleecpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyToJSCallee.cpp</a></li>

<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyToJSCalleeh">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyToJSCallee.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkJSTestsChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/JSTests/ChangeLog        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/JSTests/ChangeLog        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -1,3 +1,12 @@

</span><ins>+2016-12-08  JF Bastien  &lt;jfbastien@apple.com&gt;

+

+        WebAssembly JS API: wire up Instance imports

+        https://bugs.webkit.org/show_bug.cgi?id=165118

+

+        Reviewed by Saam Barati.

+

+        * wasm/js-api/test_Instance.js: add the test, disabled for now

+

</ins><span class="cx"> 2016-12-07  Keith Miller  &lt;keith_miller@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Add more missing trivial wasm ops.

</span></span></pre></div>

<a id="trunkJSTestswasmjsapitest_Instancejs"></a>

<div class="modfile"><h4>Modified: trunk/JSTests/wasm/js-api/test_Instance.js (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/JSTests/wasm/js-api/test_Instance.js        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/JSTests/wasm/js-api/test_Instance.js        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -29,3 +29,36 @@

</span><span class="cx">     assert.isA(result, &quot;number&quot;);

</span><span class="cx">     assert.eq(result, 42);

</span><span class="cx"> })();

</span><ins>+

+/* FIXME this currently crashes as detailed in https://bugs.webkit.org/show_bug.cgi?id=165591

+(function Import() {

+    let counter = 0;

+    const counterSetter = v =&gt; counter = v;

+    const builder = (new Builder())

+        .Type().End()

+        .Import()

+            .Function(&quot;imp&quot;, &quot;func&quot;, { params: [&quot;i32&quot;] })

+        .End()

+        .Function().End()

+        .Export()

+            .Function(&quot;changeCounter&quot;)

+        .End()

+        .Code()

+            .Function(&quot;changeCounter&quot;, { params: [&quot;i32&quot;] })

+                .I32Const(42)

+                .GetLocal(0)

+                .I32Add()

+                .Call(0) // Calls func(param[0] + 42).

+            .End()

+        .End();

+    const bin = builder.WebAssembly().get();

+    const module = new WebAssembly.Module(bin);

+    const instance = new WebAssembly.Instance(module, { imp: { func: counterSetter } });

+    instance.exports.changeCounter(0);

+    assert.eq(counter, 42);

+    instance.exports.changeCounter(1);

+    assert.eq(counter, 43);

+    instance.exports.changeCounter(42);

+    assert.eq(counter, 84);

+})();

+*/

</ins></span></pre></div>

<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/CMakeLists.txt        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -896,6 +896,7 @@

</span><span class="cx"> 

</span><span class="cx">     wasm/JSWebAssembly.cpp

</span><span class="cx">     wasm/WasmB3IRGenerator.cpp

</span><ins>+    wasm/WasmBinding.cpp

</ins><span class="cx">     wasm/WasmCallingConvention.cpp

</span><span class="cx">     wasm/WasmFormat.cpp

</span><span class="cx">     wasm/WasmMemory.cpp

</span><span class="lines">@@ -925,6 +926,7 @@

</span><span class="cx">     wasm/js/WebAssemblyRuntimeErrorPrototype.cpp

</span><span class="cx">     wasm/js/WebAssemblyTableConstructor.cpp

</span><span class="cx">     wasm/js/WebAssemblyTablePrototype.cpp

</span><ins>+    wasm/js/WebAssemblyToJSCallee.cpp

</ins><span class="cx"> 

</span><span class="cx">     yarr/RegularExpression.cpp

</span><span class="cx">     yarr/YarrCanonicalizeUCS2.cpp

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/ChangeLog        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -1,3 +1,121 @@

</span><ins>+2016-12-08  JF Bastien  &lt;jfbastien@apple.com&gt;

+

+        WebAssembly JS API: wire up Instance imports

+        https://bugs.webkit.org/show_bug.cgi?id=165118

+

+        Reviewed by Saam Barati.

+

+        Change a bunch of the WebAssembly object model, and pipe the

+        necessary changes to be able to call JS imports from

+        WebAssembly. This will make it easier to call_indirect, and

+        unblock many other missing features.

+

+        As a follow-up I need to teach JSC::linkFor to live without a

+        CodeBlock: wasm doesn't have one and the IC patching is sad. We'll

+        switch on the callee (or its type?) and then use that as the owner

+        (because the callee is alive if the instance is alive, ditto

+        module, and module owns the CallLinkInfo).

+

+        * CMakeLists.txt:

+        * JavaScriptCore.xcodeproj/project.pbxproj:

+        * interpreter/CallFrame.h:

+        (JSC::ExecState::callee): give access to the callee as a JSCell

+        * jit/RegisterSet.cpp: dead code from previous WebAssembly implementation

+        * jsc.cpp:

+        (callWasmFunction):

+        (functionTestWasmModuleFunctions):

+        * runtime/JSCellInlines.h:

+        (JSC::ExecState::vm): check callee instead of jsCallee: wasm only has a JSCell and not a JSObject

+        * runtime/VM.cpp:

+        (JSC::VM::VM): store the &quot;top&quot; WebAssembly.Instance on entry to WebAssembly (and restore the previous one on exit)

+        * runtime/VM.h:

+        * testWasm.cpp:

+        (runWasmTests):

+        * wasm/JSWebAssembly.h:

+        * wasm/WasmB3IRGenerator.cpp:

+        (JSC::Wasm::B3IRGenerator::B3IRGenerator): pass unlinked calls around to shorten their lifetime: they're ony needed until the Plan is done

+        (JSC::Wasm::B3IRGenerator::addCall):

+        (JSC::Wasm::createJSToWasmWrapper):

+        (JSC::Wasm::parseAndCompile): also pass in the function index space, so that imports can be signature-checked along with internal functions

+        * wasm/WasmB3IRGenerator.h:

+        * wasm/WasmBinding.cpp: Added.

+        (JSC::Wasm::importStubGenerator): stubs from wasm to JS

+        * wasm/WasmBinding.h: Copied from Source/JavaScriptCore/wasm/WasmValidate.h.

+        * wasm/WasmCallingConvention.h:

+        (JSC::Wasm::CallingConvention::setupFrameInPrologue):

+        * wasm/WasmFormat.h: fix the object model

+        (JSC::Wasm::CallableFunction::CallableFunction):

+        * wasm/WasmFunctionParser.h: simplify some of the failure condition checks

+        (JSC::Wasm::FunctionParser&lt;Context&gt;::FunctionParser): need function index space, not just internal functions

+        (JSC::Wasm::FunctionParser&lt;Context&gt;::parseExpression):

+        * wasm/WasmModuleParser.cpp: early-create some of the structures which will be needed later

+        (JSC::Wasm::ModuleParser::parseImport):

+        (JSC::Wasm::ModuleParser::parseFunction):

+        (JSC::Wasm::ModuleParser::parseMemory):

+        (JSC::Wasm::ModuleParser::parseExport):

+        (JSC::Wasm::ModuleParser::parseCode):

+        * wasm/WasmModuleParser.h:

+        (JSC::Wasm::ModuleParser::functionIndexSpace):

+        (JSC::Wasm::ModuleParser::functionLocations):

+        * wasm/WasmParser.h:

+        (JSC::Wasm::Parser::consumeUTF8String):

+        * wasm/WasmPlan.cpp: pass around the wasm objects at the right time, reducing their lifetime and making it easier to pass them around when needed

+        (JSC::Wasm::Plan::run):

+        (JSC::Wasm::Plan::initializeCallees):

+        * wasm/WasmPlan.h:

+        (JSC::Wasm::Plan::exports):

+        (JSC::Wasm::Plan::internalFunctionCount):

+        (JSC::Wasm::Plan::jsToWasmEntryPointForFunction):

+        (JSC::Wasm::Plan::takeModuleInformation):

+        (JSC::Wasm::Plan::takeCallLinkInfos):

+        (JSC::Wasm::Plan::takeWasmToJSStubs):

+        (JSC::Wasm::Plan::takeFunctionIndexSpace):

+        * wasm/WasmValidate.cpp: check function index space instead of only internal functions

+        (JSC::Wasm::Validate::addCall):

+        (JSC::Wasm::validateFunction):

+        * wasm/WasmValidate.h:

+        * wasm/js/JSWebAssemblyCallee.cpp:

+        (JSC::JSWebAssemblyCallee::finishCreation):

+        * wasm/js/JSWebAssemblyCallee.h:

+        (JSC::JSWebAssemblyCallee::create):

+        (JSC::JSWebAssemblyCallee::jsToWasmEntryPoint):

+        * wasm/js/JSWebAssemblyInstance.cpp:

+        (JSC::JSWebAssemblyInstance::create):

+        (JSC::JSWebAssemblyInstance::JSWebAssemblyInstance):

+        (JSC::JSWebAssemblyInstance::visitChildren):

+        * wasm/js/JSWebAssemblyInstance.h: hold the import functions off the end of the Instance

+        (JSC::JSWebAssemblyInstance::importFunction):

+        (JSC::JSWebAssemblyInstance::importFunctions):

+        (JSC::JSWebAssemblyInstance::setImportFunction):

+        (JSC::JSWebAssemblyInstance::offsetOfImportFunctions):

+        (JSC::JSWebAssemblyInstance::offsetOfImportFunction):

+        (JSC::JSWebAssemblyInstance::allocationSize):

+        * wasm/js/JSWebAssemblyModule.cpp:

+        (JSC::JSWebAssemblyModule::create):

+        (JSC::JSWebAssemblyModule::JSWebAssemblyModule):

+        (JSC::JSWebAssemblyModule::visitChildren):

+        * wasm/js/JSWebAssemblyModule.h: hold the link call info, the import function stubs, and the function index space

+        (JSC::JSWebAssemblyModule::signatureForFunctionIndexSpace):

+        (JSC::JSWebAssemblyModule::importCount):

+        (JSC::JSWebAssemblyModule::calleeFromFunctionIndexSpace):

+        * wasm/js/WebAssemblyFunction.cpp:

+        (JSC::callWebAssemblyFunction): set top Instance on VM

+        * wasm/js/WebAssemblyFunction.h:

+        (JSC::WebAssemblyFunction::instance):

+        * wasm/js/WebAssemblyInstanceConstructor.cpp:

+        (JSC::constructJSWebAssemblyInstance): handle function imports

+        * wasm/js/WebAssemblyModuleConstructor.cpp:

+        (JSC::constructJSWebAssemblyModule): generate the stubs for import functions

+        * wasm/js/WebAssemblyModuleRecord.cpp:

+        (JSC::WebAssemblyModuleRecord::link):

+        * wasm/js/WebAssemblyToJSCallee.cpp: Copied from Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.cpp.

+        (JSC::WebAssemblyToJSCallee::create): dummy JSCell singleton which lives on the VM, and is put as the callee in the import stub's frame to identified it when unwinding

+        (JSC::WebAssemblyToJSCallee::createStructure):

+        (JSC::WebAssemblyToJSCallee::WebAssemblyToJSCallee):

+        (JSC::WebAssemblyToJSCallee::finishCreation):

+        (JSC::WebAssemblyToJSCallee::destroy):

+        * wasm/js/WebAssemblyToJSCallee.h: Copied from Source/JavaScriptCore/wasm/WasmB3IRGenerator.h.

+

</ins><span class="cx"> 2016-12-08  Mark Lam  &lt;mark.lam@apple.com&gt;

</span><span class="cx"> 

<span class="cx">         Enable JSC restricted options by default in the jsc shell.

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -2008,7 +2008,11 @@

</span><span class="cx">                 AD4937C81DDD0AAE0077C807 /* WebAssemblyModuleRecord.h in Headers */ = {isa = PBXBuildFile; fileRef = AD4937C61DDCDCF00077C807 /* WebAssemblyModuleRecord.h */; };

</span><span class="cx">                 AD4937D31DDD27DE0077C807 /* WebAssemblyFunction.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4937C91DDD27340077C807 /* WebAssemblyFunction.cpp */; };

</span><span class="cx">                 AD4937D41DDD27DE0077C807 /* WebAssemblyFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = AD4937CA1DDD27340077C807 /* WebAssemblyFunction.h */; };

</span><ins>+                AD4B1DF91DF244E20071AE32 /* WasmBinding.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD4B1DF71DF244D70071AE32 /* WasmBinding.cpp */; };

+                AD4B1DFA1DF244E20071AE32 /* WasmBinding.h in Headers */ = {isa = PBXBuildFile; fileRef = AD4B1DF81DF244D70071AE32 /* WasmBinding.h */; };

</ins><span class="cx">                 AD86A93E1AA4D88D002FE77F /* WeakGCMapInlines.h in Headers */ = {isa = PBXBuildFile; fileRef = AD86A93D1AA4D87C002FE77F /* WeakGCMapInlines.h */; settings = {ATTRIBUTES = (Private, ); }; };

</span><ins>+                ADBC54D41DF8EA2B005BF738 /* WebAssemblyToJSCallee.cpp in Sources */ = {isa = PBXBuildFile; fileRef = ADBC54D21DF8EA00005BF738 /* WebAssemblyToJSCallee.cpp */; };

+                ADBC54D51DF8EA2B005BF738 /* WebAssemblyToJSCallee.h in Headers */ = {isa = PBXBuildFile; fileRef = ADBC54D31DF8EA00005BF738 /* WebAssemblyToJSCallee.h */; };

</ins><span class="cx">                 ADDB1F6318D77DBE009B58A8 /* OpaqueRootSet.h in Headers */ = {isa = PBXBuildFile; fileRef = ADDB1F6218D77DB7009B58A8 /* OpaqueRootSet.h */; settings = {ATTRIBUTES = (Private, ); }; };

</span><span class="cx">                 ADE39FFF16DD144B0003CD4A /* PropertyTable.cpp in Sources */ = {isa = PBXBuildFile; fileRef = AD1CF06816DCAB2D00B97123 /* PropertyTable.cpp */; };

</span><span class="cx">                 B59F89391891F29F00D5CCDC /* UnlinkedInstructionStream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B59F89381891ADB500D5CCDC /* UnlinkedInstructionStream.cpp */; };

</span><span class="lines">@@ -4473,7 +4477,11 @@

</span><span class="cx">                 AD4937C61DDCDCF00077C807 /* WebAssemblyModuleRecord.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebAssemblyModuleRecord.h; path = js/WebAssemblyModuleRecord.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 AD4937C91DDD27340077C807 /* WebAssemblyFunction.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebAssemblyFunction.cpp; path = js/WebAssemblyFunction.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 AD4937CA1DDD27340077C807 /* WebAssemblyFunction.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebAssemblyFunction.h; path = js/WebAssemblyFunction.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><ins>+                AD4B1DF71DF244D70071AE32 /* WasmBinding.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WasmBinding.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };

+                AD4B1DF81DF244D70071AE32 /* WasmBinding.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmBinding.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</ins><span class="cx">                 AD86A93D1AA4D87C002FE77F /* WeakGCMapInlines.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WeakGCMapInlines.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><ins>+                ADBC54D21DF8EA00005BF738 /* WebAssemblyToJSCallee.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = WebAssemblyToJSCallee.cpp; path = js/WebAssemblyToJSCallee.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };

+                ADBC54D31DF8EA00005BF738 /* WebAssemblyToJSCallee.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = WebAssemblyToJSCallee.h; path = js/WebAssemblyToJSCallee.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</ins><span class="cx">                 ADDB1F6218D77DB7009B58A8 /* OpaqueRootSet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OpaqueRootSet.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 B59F89371891AD3300D5CCDC /* UnlinkedInstructionStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UnlinkedInstructionStream.h; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="cx">                 B59F89381891ADB500D5CCDC /* UnlinkedInstructionStream.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UnlinkedInstructionStream.cpp; sourceTree = &quot;&lt;group&gt;&quot;; };

</span><span class="lines">@@ -5984,11 +5992,13 @@

</span><span class="cx">                 7B98D1331B60CD1E0023B1A4 /* wasm */ = {

</span><span class="cx">                         isa = PBXGroup;

</span><span class="cx">                         children = (

</span><ins>+                                AD2FCB8A1DB5840000B3E736 /* js */,

</ins><span class="cx">                                 AD2FCC2E1DB839F700B3E736 /* JSWebAssembly.cpp */,

</span><span class="cx">                                 AD2FCC2F1DB839F700B3E736 /* JSWebAssembly.h */,

</span><del>-                                AD2FCB8A1DB5840000B3E736 /* js */,

</del><span class="cx">                                 53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */,

</span><span class="cx">                                 53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */,

</span><ins>+                                AD4B1DF71DF244D70071AE32 /* WasmBinding.cpp */,

+                                AD4B1DF81DF244D70071AE32 /* WasmBinding.h */,

</ins><span class="cx">                                 53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */,

</span><span class="cx">                                 53FD04D21D7AB187003287D3 /* WasmCallingConvention.h */,

</span><span class="cx">                                 AD2FCC321DC4045300B3E736 /* WasmFormat.cpp */,

</span><span class="lines">@@ -5998,9 +6008,9 @@

</span><span class="cx">                                 535557131D9D9EA5006D583B /* WasmMemory.h */,

</span><span class="cx">                                 53F40E961D5A7BEC0099A1B6 /* WasmModuleParser.cpp */,

</span><span class="cx">                                 53F40E941D5A7AEF0099A1B6 /* WasmModuleParser.h */,

</span><ins>+                                53F40E8C1D5901F20099A1B6 /* WasmParser.h */,

</ins><span class="cx">                                 531374BE1D5CE95000AF7A0B /* WasmPlan.cpp */,

</span><span class="cx">                                 531374BC1D5CE67600AF7A0B /* WasmPlan.h */,

</span><del>-                                53F40E8C1D5901F20099A1B6 /* WasmParser.h */,

</del><span class="cx">                                 53F40E841D58F9770099A1B6 /* WasmSections.h */,

</span><span class="cx">                                 53FF7F9A1DBFD2B900A26CCC /* WasmValidate.cpp */,

</span><span class="cx">                                 53FF7F981DBFCD9000A26CCC /* WasmValidate.h */,

</span><span class="lines">@@ -7557,12 +7567,6 @@

</span><span class="cx">                 AD2FCB8A1DB5840000B3E736 /* js */ = {

</span><span class="cx">                         isa = PBXGroup;

</span><span class="cx">                         children = (

</span><del>-                                AD4937C91DDD27340077C807 /* WebAssemblyFunction.cpp */,

-                                AD4937CA1DDD27340077C807 /* WebAssemblyFunction.h */,

-                                AD4937C51DDCDCF00077C807 /* WebAssemblyModuleRecord.cpp */,

-                                AD4937C61DDCDCF00077C807 /* WebAssemblyModuleRecord.h */,

-                                AD2FCC261DB838C400B3E736 /* WebAssemblyPrototype.cpp */,

-                                AD2FCC271DB838C400B3E736 /* WebAssemblyPrototype.h */,

</del><span class="cx">                                 79E423E01DEE65320078D355 /* JSWebAssemblyCallee.cpp */,

</span><span class="cx">                                 79E423E11DEE65320078D355 /* JSWebAssemblyCallee.h */,

</span><span class="cx">                                 AD2FCBA61DB58DA400B3E736 /* JSWebAssemblyCompileError.cpp */,

</span><span class="lines">@@ -7571,6 +7575,8 @@

</span><span class="cx">                                 AD2FCBA91DB58DA400B3E736 /* JSWebAssemblyInstance.h */,

</span><span class="cx">                                 AD2FCBAA1DB58DA400B3E736 /* JSWebAssemblyMemory.cpp */,

</span><span class="cx">                                 AD2FCBAB1DB58DA400B3E736 /* JSWebAssemblyMemory.h */,

</span><ins>+                                AD2FCB8C1DB5844000B3E736 /* JSWebAssemblyModule.cpp */,

+                                AD2FCB8D1DB5844000B3E736 /* JSWebAssemblyModule.h */,

</ins><span class="cx">                                 AD2FCBAC1DB58DA400B3E736 /* JSWebAssemblyRuntimeError.cpp */,

</span><span class="cx">                                 AD2FCBAD1DB58DA400B3E736 /* JSWebAssemblyRuntimeError.h */,

</span><span class="cx">                                 AD2FCBAE1DB58DA400B3E736 /* JSWebAssemblyTable.cpp */,

</span><span class="lines">@@ -7579,6 +7585,8 @@

</span><span class="cx">                                 AD2FCBB11DB58DA400B3E736 /* WebAssemblyCompileErrorConstructor.h */,

</span><span class="cx">                                 AD2FCBB21DB58DA400B3E736 /* WebAssemblyCompileErrorPrototype.cpp */,

</span><span class="cx">                                 AD2FCBB31DB58DA400B3E736 /* WebAssemblyCompileErrorPrototype.h */,

</span><ins>+                                AD4937C91DDD27340077C807 /* WebAssemblyFunction.cpp */,

+                                AD4937CA1DDD27340077C807 /* WebAssemblyFunction.h */,

</ins><span class="cx">                                 AD2FCBB41DB58DA400B3E736 /* WebAssemblyInstanceConstructor.cpp */,

</span><span class="cx">                                 AD2FCBB51DB58DA400B3E736 /* WebAssemblyInstanceConstructor.h */,

</span><span class="cx">                                 AD2FCBB61DB58DA400B3E736 /* WebAssemblyInstancePrototype.cpp */,

</span><span class="lines">@@ -7587,6 +7595,14 @@

</span><span class="cx">                                 AD2FCBB91DB58DA400B3E736 /* WebAssemblyMemoryConstructor.h */,

</span><span class="cx">                                 AD2FCBBA1DB58DA400B3E736 /* WebAssemblyMemoryPrototype.cpp */,

</span><span class="cx">                                 AD2FCBBB1DB58DA400B3E736 /* WebAssemblyMemoryPrototype.h */,

</span><ins>+                                AD2FCB981DB585A600B3E736 /* WebAssemblyModuleConstructor.cpp */,

+                                AD2FCB991DB585A600B3E736 /* WebAssemblyModuleConstructor.h */,

+                                AD2FCB9A1DB585A600B3E736 /* WebAssemblyModulePrototype.cpp */,

+                                AD2FCB9B1DB585A600B3E736 /* WebAssemblyModulePrototype.h */,

+                                AD4937C51DDCDCF00077C807 /* WebAssemblyModuleRecord.cpp */,

+                                AD4937C61DDCDCF00077C807 /* WebAssemblyModuleRecord.h */,

+                                AD2FCC261DB838C400B3E736 /* WebAssemblyPrototype.cpp */,

+                                AD2FCC271DB838C400B3E736 /* WebAssemblyPrototype.h */,

</ins><span class="cx">                                 AD2FCBBC1DB58DA400B3E736 /* WebAssemblyRuntimeErrorConstructor.cpp */,

</span><span class="cx">                                 AD2FCBBD1DB58DA400B3E736 /* WebAssemblyRuntimeErrorConstructor.h */,

</span><span class="cx">                                 AD2FCBBE1DB58DA400B3E736 /* WebAssemblyRuntimeErrorPrototype.cpp */,

</span><span class="lines">@@ -7595,12 +7611,8 @@

</span><span class="cx">                                 AD2FCBC11DB58DA400B3E736 /* WebAssemblyTableConstructor.h */,

</span><span class="cx">                                 AD2FCBC21DB58DA400B3E736 /* WebAssemblyTablePrototype.cpp */,

</span><span class="cx">                                 AD2FCBC31DB58DA400B3E736 /* WebAssemblyTablePrototype.h */,

</span><del>-                                AD2FCB981DB585A600B3E736 /* WebAssemblyModuleConstructor.cpp */,

-                                AD2FCB991DB585A600B3E736 /* WebAssemblyModuleConstructor.h */,

-                                AD2FCB9A1DB585A600B3E736 /* WebAssemblyModulePrototype.cpp */,

-                                AD2FCB9B1DB585A600B3E736 /* WebAssemblyModulePrototype.h */,

-                                AD2FCB8C1DB5844000B3E736 /* JSWebAssemblyModule.cpp */,

-                                AD2FCB8D1DB5844000B3E736 /* JSWebAssemblyModule.h */,

</del><ins>+                                ADBC54D21DF8EA00005BF738 /* WebAssemblyToJSCallee.cpp */,

+                                ADBC54D31DF8EA00005BF738 /* WebAssemblyToJSCallee.h */,

</ins><span class="cx">                         );

</span><span class="cx">                         name = js;

</span><span class="cx">                         sourceTree = &quot;&lt;group&gt;&quot;;

</span><span class="lines">@@ -8313,6 +8325,7 @@

</span><span class="cx">                                 0F2B66E017B6B5AB00A7AE3F /* GenericTypedArrayView.h in Headers */,

</span><span class="cx">                                 0F2B66E117B6B5AB00A7AE3F /* GenericTypedArrayViewInlines.h in Headers */,

</span><span class="cx">                                 0F9332A014CA7DCD0085F3C6 /* GetByIdStatus.h in Headers */,

</span><ins>+                                AD4B1DFA1DF244E20071AE32 /* WasmBinding.h in Headers */,

</ins><span class="cx">                                 0F0332C418B01763005F979A /* GetByIdVariant.h in Headers */,

</span><span class="cx">                                 7964656A1B952FF0003059EE /* GetPutInfo.h in Headers */,

</span><span class="cx">                                 AD2FCC1C1DB59CB200B3E736 /* WebAssemblyModuleConstructor.lut.h in Headers */,

</span><span class="lines">@@ -8501,6 +8514,7 @@

</span><span class="cx">                                 0F2B66F517B6B5AB00A7AE3F /* JSGenericTypedArrayViewPrototype.h in Headers */,

</span><span class="cx">                                 53917E7B1B7906FA000EBD33 /* JSGenericTypedArrayViewPrototypeFunctions.h in Headers */,

</span><span class="cx">                                 0F2B66F617B6B5AB00A7AE3F /* JSGenericTypedArrayViewPrototypeInlines.h in Headers */,

</span><ins>+                                ADBC54D51DF8EA2B005BF738 /* WebAssemblyToJSCallee.h in Headers */,

</ins><span class="cx">                                 797E07AA1B8FCFB9008400BA /* JSGlobalLexicalEnvironment.h in Headers */,

</span><span class="cx">                                 BC18C4210E16F5CD00B34460 /* JSGlobalObject.h in Headers */,

</span><span class="cx">                                 53F40E8B1D5901BB0099A1B6 /* WasmFunctionParser.h in Headers */,

</span><span class="lines">@@ -9917,6 +9931,7 @@

</span><span class="cx">                                 62D2D38F1ADF103F000206C1 /* FunctionRareData.cpp in Sources */,

</span><span class="cx">                                 2AACE63C18CA5A0300ED0191 /* GCActivityCallback.cpp in Sources */,

</span><span class="cx">                                 0F766D2F15A8DCE0008F363E /* GCAwareJITStubRoutine.cpp in Sources */,

</span><ins>+                                AD4B1DF91DF244E20071AE32 /* WasmBinding.cpp in Sources */,

</ins><span class="cx">                                 2ADFA26318EF3540004F9FCC /* GCLogging.cpp in Sources */,

</span><span class="cx">                                 5341FC701DAC33E500E7E4D7 /* B3WasmBoundsCheckValue.cpp in Sources */,

</span><span class="cx">                                 0F93329F14CA7DCA0085F3C6 /* GetByIdStatus.cpp in Sources */,

</span><span class="lines">@@ -10055,6 +10070,7 @@

</span><span class="cx">                                 0F4A38F91C8E13DF00190318 /* SuperSampler.cpp in Sources */,

</span><span class="cx">                                 797E07A91B8FCFB9008400BA /* JSGlobalLexicalEnvironment.cpp in Sources */,

</span><span class="cx">                                 DC454B8C1D00E822004C18AF /* AirDumpAsJS.cpp in Sources */,

</span><ins>+                                ADBC54D41DF8EA2B005BF738 /* WebAssemblyToJSCallee.cpp in Sources */,

</ins><span class="cx">                                 147F39D2107EC37600427A48 /* JSGlobalObject.cpp in Sources */,

</span><span class="cx">                                 A5FD0085189B1B7E00633231 /* JSGlobalObjectConsoleAgent.cpp in Sources */,

</span><span class="cx">                                 A5C3A1A518C0490200C9593A /* JSGlobalObjectConsoleClient.cpp in Sources */,

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinterpreterCallFrameh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.h (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.h        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.h        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -86,6 +86,7 @@

</span><span class="cx">     public:

</span><span class="cx">         static const int headerSizeInRegisters = CallFrameSlot::argumentCount + 1;

</span><span class="cx"> 

</span><ins>+        JSCell* callee() const { return this[CallFrameSlot::callee].unboxedCell(); }

</ins><span class="cx">         JSValue calleeAsValue() const { return this[CallFrameSlot::callee].jsValue(); }

</span><span class="cx">         JSObject* jsCallee() const { return this[CallFrameSlot::callee].object(); }

</span><span class="cx">         SUPPRESS_ASAN JSValue unsafeCallee() const { return this[CallFrameSlot::callee].asanUnsafeJSValue(); }

</span></span></pre></div>

<a id="trunkSourceJavaScriptCorejitRegisterSetcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jit/RegisterSet.cpp (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/jit/RegisterSet.cpp        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/jit/RegisterSet.cpp        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -306,39 +306,6 @@

</span><span class="cx">     return result;

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-#if ENABLE(WEBASSEMBLY)

-RegisterSet RegisterSet::webAssemblyCalleeSaveRegisters()

-{

-    RegisterSet result;

-#if CPU(X86)

-#elif CPU(X86_64)

-#if !OS(WINDOWS)

-    ASSERT(GPRInfo::regCS3 == GPRInfo::tagTypeNumberRegister);

-    ASSERT(GPRInfo::regCS4 == GPRInfo::tagMaskRegister);

-    result.set(GPRInfo::regCS3);

-    result.set(GPRInfo::regCS4);

-#else

-    ASSERT(GPRInfo::regCS5 == GPRInfo::tagTypeNumberRegister);

-    ASSERT(GPRInfo::regCS6 == GPRInfo::tagMaskRegister);

-    result.set(GPRInfo::regCS5);

-    result.set(GPRInfo::regCS6);

-#endif

-#elif CPU(ARM_THUMB2)

-#elif CPU(ARM_TRADITIONAL)

-#elif CPU(ARM64)

-    ASSERT(GPRInfo::regCS8 == GPRInfo::tagTypeNumberRegister);

-    ASSERT(GPRInfo::regCS9 == GPRInfo::tagMaskRegister);

-    result.set(GPRInfo::regCS8);

-    result.set(GPRInfo::regCS9);

-#elif CPU(MIPS)

-#elif CPU(SH4)

-#else

-    UNREACHABLE_FOR_PLATFORM();

-#endif

-    return result;

-}

-#endif

-

</del><span class="cx"> RegisterSet RegisterSet::argumentGPRS()

</span><span class="cx"> {

</span><span class="cx">     RegisterSet result;

</span></span></pre></div>

<a id="trunkSourceJavaScriptCorejsccpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/jsc.cpp        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -2592,7 +2592,7 @@

</span><span class="cx">     ProtoCallFrame protoCallFrame;

</span><span class="cx">     protoCallFrame.init(nullptr, globalObject-&gt;globalExec()-&gt;jsCallee(), firstArgument, argCount, remainingArgs);

</span><span class="cx"> 

</span><del>-    return JSValue::decode(vmEntryToWasm(wasmCallee-&gt;jsEntryPoint(), vm, &amp;protoCallFrame));

</del><ins>+    return JSValue::decode(vmEntryToWasm(wasmCallee-&gt;jsToWasmEntryPoint(), vm, &amp;protoCallFrame));

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> // testWasmModule(JSArrayBufferView source, number functionCount, ...[[WasmValue, [WasmValue]]]) where the ith copy of [[result, [args]]] is a list

</span><span class="lines">@@ -2618,7 +2618,7 @@

</span><span class="cx">         CRASH();

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    if (plan.compiledFunctionCount() != functionCount)

</del><ins>+    if (plan.internalFunctionCount() != functionCount)

</ins><span class="cx">         CRASH();

</span><span class="cx"> 

</span><span class="cx">     MarkedArgumentBuffer callees;

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeJSCellInlinesh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCellInlines.h (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCellInlines.h        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/runtime/JSCellInlines.h        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -123,11 +123,11 @@

</span><span class="cx"> 

</span><span class="cx"> ALWAYS_INLINE VM&amp; ExecState::vm() const

</span><span class="cx"> {

</span><del>-    ASSERT(jsCallee());

-    ASSERT(jsCallee()-&gt;vm());

-    ASSERT(!jsCallee()-&gt;isLargeAllocation());

</del><ins>+    ASSERT(callee());

+    ASSERT(callee()-&gt;vm());

+    ASSERT(!callee()-&gt;isLargeAllocation());

</ins><span class="cx">     // This is an important optimization since we access this so often.

</span><del>-    return *calleeAsValue().asCell()-&gt;markedBlock().vm();

</del><ins>+    return *callee()-&gt;markedBlock().vm();

</ins><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename T&gt;

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeVMcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.cpp (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.cpp        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/runtime/VM.cpp        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -168,6 +168,7 @@

</span><span class="cx">     , clientData(0)

</span><span class="cx">     , topVMEntryFrame(nullptr)

</span><span class="cx">     , topCallFrame(CallFrame::noCaller())

</span><ins>+    , topJSWebAssemblyInstance(nullptr)

</ins><span class="cx">     , m_atomicStringTable(vmType == Default ? wtfThreadData().atomicStringTable() : new AtomicStringTable)

</span><span class="cx">     , propertyNames(nullptr)

</span><span class="cx">     , emptyList(new MarkedArgumentBuffer)

</span><span class="lines">@@ -229,6 +230,8 @@

</span><span class="cx">     functionExecutableStructure.set(*this, FunctionExecutable::createStructure(*this, 0, jsNull()));

</span><span class="cx"> #if ENABLE(WEBASSEMBLY)

</span><span class="cx">     webAssemblyCalleeStructure.set(*this, JSWebAssemblyCallee::createStructure(*this, 0, jsNull()));

</span><ins>+    webAssemblyToJSCalleeStructure.set(*this, WebAssemblyToJSCallee::createStructure(*this, 0, jsNull()));

+    webAssemblyToJSCallee.set(*this, WebAssemblyToJSCallee::create(*this, webAssemblyToJSCalleeStructure.get()));

</ins><span class="cx"> #endif

</span><span class="cx">     moduleProgramExecutableStructure.set(*this, ModuleProgramExecutable::createStructure(*this, 0, jsNull()));

</span><span class="cx">     regExpStructure.set(*this, RegExp::createStructure(*this, 0, jsNull()));

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/runtime/VM.h        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -96,6 +96,7 @@

</span><span class="cx"> class JSCustomGetterSetterFunction;

</span><span class="cx"> class JSGlobalObject;

</span><span class="cx"> class JSObject;

</span><ins>+class JSWebAssemblyInstance;

</ins><span class="cx"> class LLIntOffsetsExtractor;

</span><span class="cx"> class NativeExecutable;

</span><span class="cx"> class RegExpCache;

</span><span class="lines">@@ -292,7 +293,8 @@

<span class="cx">     // topVMEntryFrame.

<span class="cx">     // FIXME: This should be a void*, because it might not point to a CallFrame.

</span><span class="cx">     // https://bugs.webkit.org/show_bug.cgi?id=160441

</span><del>-    ExecState* topCallFrame; 

</del><ins>+    ExecState* topCallFrame;

+    JSWebAssemblyInstance* topJSWebAssemblyInstance;

</ins><span class="cx">     Strong&lt;Structure&gt; structureStructure;

</span><span class="cx">     Strong&lt;Structure&gt; structureRareDataStructure;

</span><span class="cx">     Strong&lt;Structure&gt; terminatedExecutionErrorStructure;

</span><span class="lines">@@ -310,6 +312,8 @@

</span><span class="cx">     Strong&lt;Structure&gt; functionExecutableStructure;

</span><span class="cx"> #if ENABLE(WEBASSEMBLY)

</span><span class="cx">     Strong&lt;Structure&gt; webAssemblyCalleeStructure;

</span><ins>+    Strong&lt;Structure&gt; webAssemblyToJSCalleeStructure;

+    Strong&lt;JSCell&gt; webAssemblyToJSCallee;

</ins><span class="cx"> #endif

</span><span class="cx">     Strong&lt;Structure&gt; moduleProgramExecutableStructure;

</span><span class="cx">     Strong&lt;Structure&gt; regExpStructure;

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoretestWasmcpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/testWasm.cpp (209559 => 209560)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/testWasm.cpp        2016-12-08 20:57:59 UTC (rev 209559)

+++ trunk/Source/JavaScriptCore/testWasm.cpp        2016-12-08 21:09:06 UTC (rev 209560)

</span><span class="lines">@@ -175,13 +175,13 @@

</span><span class="cx">         CRASH();

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    if (plan.compiledFunctionCount() != expectedNumberOfFunctions) {

</del><ins>+    if (plan.internalFunctionCount() != expectedNumberOfFunctions) {

</ins><span class="cx">         dataLogLn(&quot;Incorrect number of functions&quot;);

</span><span class="cx">         CRASH();

</span><span class="cx">     }

</span><span class="cx"> 

</span><span class="cx">     for (unsigned i = 0; i &lt; expectedNumberOfFunctions; ++i) {

</span><del>-        if (!plan.compiledFunction(i)) {

</del><ins>+        if (!plan.jsToWasmEntryPointForFunction(i)) {

</ins><span class="cx">             dataLogLn(&quot;Function at index, &quot; , i, &quot; failed to compile correctly&quot;);

</span><span class="cx">             CRASH();

</span><span class="cx">         }

</span><span class="lines">@@ -222,10 +222,10 @@

</span><span class="cx">         checkPlan(plan, 1);

</span><span class="cx"> 