<!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>[209696] 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/209696">209696</a></dd>
<dt>Author</dt> <dd>sbarati@apple.com</dd>
<dt>Date</dt> <dd>2016-12-11 19:11:18 -0800 (Sun, 11 Dec 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>We should be able to throw exceptions from Wasm code and when Wasm frames are on the stack
https://bugs.webkit.org/show_bug.cgi?id=165429
Reviewed by Keith Miller.
JSTests:
* wasm/function-tests/trap-load.js: Added.
(assert):
(wasmFrameCountFromError):
(i.catch):
(assert.continuation):
* wasm/function-tests/trap-store.js: Added.
(import.Builder.from.string_appeared_here.assert):
(i.catch):
(assert.continuation):
(assert):
* wasm/js-api/test_memory_constructor.js:
(assert):
Source/JavaScriptCore:
This patch teaches the stack walking runtime about wasm.
To do this, I taught StackVisitor that a callee is not
always an object.
To be able to unwind callee save registers properly, I've given
JSWebAssemblyCallee a list of RegisterAtOffsetList for the callee
saves that B3 saved in the prologue. Also, because we have two
B3Compilations per wasm function, one for wasm entrypoint, and
one for the JS entrypoint, I needed to create a callee for each
because they each might spill callee save registers.
I also fixed a bug inside the Wasm::Memory constructor where we
were trying to mmap the same number of bytes even after the first
mmap failed. We should start by trying to mmap the maximum bytes,
and if that fails, fall back to the specified initial bytes. However,
the code was just mmapping the maximum twice. I've fixed that and
also added a RELEASE_ASSERT_NOT_REACHED() for when the second mmap
fails along with a FIXME to throw an OOM error.
There was a second bug I fixed where JSModuleRecord was calling
visitWeak on its CallLinkInfos inside ::visitChldren(). It needs
to do this after marking. I changed JSModuleRecord to do what
CodeBlock does and call visitWeak on its CallLinkInfos inside
an UnconditionalFinalizer.
* API/JSContextRef.cpp:
(BacktraceFunctor::operator()):
* inspector/ScriptCallStackFactory.cpp:
(Inspector::createScriptCallStackFromException):
* interpreter/CallFrame.cpp:
(JSC::CallFrame::vmEntryGlobalObject):
* interpreter/CallFrame.h:
(JSC::ExecState::callee):
* interpreter/Interpreter.cpp:
(JSC::GetStackTraceFunctor::operator()):
(JSC::UnwindFunctor::operator()):
(JSC::UnwindFunctor::copyCalleeSavesToVMEntryFrameCalleeSavesBuffer):
* interpreter/Interpreter.h:
* interpreter/ShadowChicken.cpp:
(JSC::ShadowChicken::update):
* interpreter/StackVisitor.cpp:
(JSC::StackVisitor::StackVisitor):
(JSC::StackVisitor::readFrame):
(JSC::StackVisitor::readNonInlinedFrame):
(JSC::StackVisitor::readInlinedFrame):
(JSC::StackVisitor::Frame::isWasmFrame):
(JSC::StackVisitor::Frame::codeType):
(JSC::StackVisitor::Frame::calleeSaveRegisters):
(JSC::StackVisitor::Frame::functionName):
(JSC::StackVisitor::Frame::sourceURL):
(JSC::StackVisitor::Frame::toString):
(JSC::StackVisitor::Frame::hasLineAndColumnInfo):
(JSC::StackVisitor::Frame::setToEnd):
* interpreter/StackVisitor.h:
(JSC::StackVisitor::Frame::callee):
(JSC::StackVisitor::Frame::isNativeFrame):
(JSC::StackVisitor::Frame::isJSFrame): Deleted.
* jsc.cpp:
(callWasmFunction):
(functionTestWasmModuleFunctions):
* runtime/Error.cpp:
(JSC::addErrorInfoAndGetBytecodeOffset):
* runtime/JSCell.cpp:
(JSC::JSCell::isAnyWasmCallee):
* runtime/JSCell.h:
* runtime/JSFunction.cpp:
(JSC::RetrieveArgumentsFunctor::operator()):
(JSC::RetrieveCallerFunctionFunctor::operator()):
* runtime/StackFrame.cpp:
(JSC::StackFrame::sourceID):
(JSC::StackFrame::sourceURL):
(JSC::StackFrame::functionName):
(JSC::StackFrame::computeLineAndColumn):
(JSC::StackFrame::toString):
* runtime/StackFrame.h:
(JSC::StackFrame::StackFrame):
(JSC::StackFrame::hasLineAndColumnInfo):
(JSC::StackFrame::hasBytecodeOffset):
(JSC::StackFrame::bytecodeOffset):
(JSC::StackFrame::isNative): Deleted.
* runtime/VM.h:
* wasm/WasmB3IRGenerator.cpp:
(JSC::Wasm::B3IRGenerator::B3IRGenerator):
(JSC::Wasm::createJSToWasmWrapper):
(JSC::Wasm::parseAndCompile):
* wasm/WasmCallingConvention.h:
(JSC::Wasm::CallingConvention::setupFrameInPrologue):
* wasm/WasmFormat.h:
* wasm/WasmMemory.cpp:
(JSC::Wasm::Memory::Memory):
* wasm/WasmMemory.h:
(JSC::Wasm::Memory::isValid):
* wasm/WasmPlan.cpp:
(JSC::Wasm::Plan::run):
(JSC::Wasm::Plan::initializeCallees):
* wasm/WasmPlan.h:
(JSC::Wasm::Plan::jsToWasmEntryPointForFunction): Deleted.
* wasm/js/JSWebAssemblyCallee.cpp:
(JSC::JSWebAssemblyCallee::finishCreation):
* wasm/js/JSWebAssemblyCallee.h:
(JSC::JSWebAssemblyCallee::create):
(JSC::JSWebAssemblyCallee::entrypoint):
(JSC::JSWebAssemblyCallee::calleeSaveRegisters):
(JSC::JSWebAssemblyCallee::jsToWasmEntryPoint): Deleted.
* wasm/js/JSWebAssemblyModule.cpp:
(JSC::JSWebAssemblyModule::JSWebAssemblyModule):
(JSC::JSWebAssemblyModule::visitChildren):
(JSC::JSWebAssemblyModule::UnconditionalFinalizer::finalizeUnconditionally):
* wasm/js/JSWebAssemblyModule.h:
(JSC::JSWebAssemblyModule::jsEntrypointCalleeFromFunctionIndexSpace):
(JSC::JSWebAssemblyModule::wasmEntrypointCalleeFromFunctionIndexSpace):
(JSC::JSWebAssemblyModule::setJSEntrypointCallee):
(JSC::JSWebAssemblyModule::setWasmEntrypointCallee):
(JSC::JSWebAssemblyModule::allocationSize):
(JSC::JSWebAssemblyModule::calleeFromFunctionIndexSpace): Deleted.
* wasm/js/JSWebAssemblyRuntimeError.h:
* wasm/js/WebAssemblyFunction.cpp:
(JSC::WebAssemblyFunction::call):
* wasm/js/WebAssemblyInstanceConstructor.cpp:
(JSC::constructJSWebAssemblyInstance):
* wasm/js/WebAssemblyMemoryConstructor.cpp:
(JSC::constructJSWebAssemblyMemory):
* wasm/js/WebAssemblyModuleConstructor.cpp:
(JSC::constructJSWebAssemblyModule):
* wasm/js/WebAssemblyModuleRecord.cpp:
(JSC::WebAssemblyModuleRecord::link):
Source/WebCore:
* bindings/js/JSDOMBinding.cpp:
(WebCore::GetCallerGlobalObjectFunctor::operator()):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkJSTestsChangeLog">trunk/JSTests/ChangeLog</a></li>
<li><a href="#trunkJSTestswasmjsapitest_memory_constructorjs">trunk/JSTests/wasm/js-api/test_memory_constructor.js</a></li>
<li><a href="#trunkSourceJavaScriptCoreAPIJSContextRefcpp">trunk/Source/JavaScriptCore/API/JSContextRef.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp">trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFramecpp">trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterCallFrameh">trunk/Source/JavaScriptCore/interpreter/CallFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpretercpp">trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterInterpreterh">trunk/Source/JavaScriptCore/interpreter/Interpreter.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterShadowChickencpp">trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorcpp">trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreinterpreterStackVisitorh">trunk/Source/JavaScriptCore/interpreter/StackVisitor.h</a></li>
<li><a href="#trunkSourceJavaScriptCorejsccpp">trunk/Source/JavaScriptCore/jsc.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeErrorcpp">trunk/Source/JavaScriptCore/runtime/Error.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellcpp">trunk/Source/JavaScriptCore/runtime/JSCell.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSCellh">trunk/Source/JavaScriptCore/runtime/JSCell.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeJSFunctioncpp">trunk/Source/JavaScriptCore/runtime/JSFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStackFramecpp">trunk/Source/JavaScriptCore/runtime/StackFrame.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeStackFrameh">trunk/Source/JavaScriptCore/runtime/StackFrame.h</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeVMh">trunk/Source/JavaScriptCore/runtime/VM.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp">trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp</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="#trunkSourceJavaScriptCorewasmWasmMemorycpp">trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmMemoryh">trunk/Source/JavaScriptCore/wasm/WasmMemory.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="#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="#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="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyRuntimeErrorh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyFunctioncpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyInstanceConstructorcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyMemoryConstructorcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.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>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorebindingsjsJSDOMBindingcpp">trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkJSTestswasmfunctionteststraploadjs">trunk/JSTests/wasm/function-tests/trap-load.js</a></li>
<li><a href="#trunkJSTestswasmfunctionteststrapstorejs">trunk/JSTests/wasm/function-tests/trap-store.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkJSTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/ChangeLog (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/ChangeLog 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/JSTests/ChangeLog 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -1,3 +1,23 @@
</span><ins>+2016-12-11 Saam Barati <sbarati@apple.com>
+
+ We should be able to throw exceptions from Wasm code and when Wasm frames are on the stack
+ https://bugs.webkit.org/show_bug.cgi?id=165429
+
+ Reviewed by Keith Miller.
+
+ * wasm/function-tests/trap-load.js: Added.
+ (assert):
+ (wasmFrameCountFromError):
+ (i.catch):
+ (assert.continuation):
+ * wasm/function-tests/trap-store.js: Added.
+ (import.Builder.from.string_appeared_here.assert):
+ (i.catch):
+ (assert.continuation):
+ (assert):
+ * wasm/js-api/test_memory_constructor.js:
+ (assert):
+
</ins><span class="cx"> 2016-12-10 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r209653, r209654, r209663, and
</span></span></pre></div>
<a id="trunkJSTestswasmfunctionteststraploadjs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/trap-load.js (0 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/trap-load.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/trap-load.js 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -0,0 +1,104 @@
</span><ins>+import Builder from '../Builder.js'
+
+const pageSize = 64 * 1024;
+const numPages = 10;
+
+const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("a", "b", {initial: numPages})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32"], ret: "i32"})
+ .GetLocal(0)
+ .I32Load(2, 0)
+ .Return()
+ .End()
+ .End();
+
+const bin = builder.WebAssembly().get();
+const module = new WebAssembly.Module(bin);
+const foo = new WebAssembly.Instance(module, {a: {b: new WebAssembly.Memory({initial: numPages})}}).exports.foo;
+
+function assert(b) {
+ if (!b)
+ throw new Error("Bad")
+}
+
+function wasmFrameCountFromError(e) {
+ let stackFrames = e.stack.split("\n").filter((s) => s.indexOf("<wasm>@[wasm code]") !== -1);
+ return stackFrames.length;
+}
+
+for (let i = 0; i < 1000; i++) {
+ let threw = false;
+ try {
+ foo(numPages * pageSize + 1);
+ } catch(e) {
+ assert(e instanceof WebAssembly.RuntimeError);
+ assert(e.message === "Out of bounds memory access");
+ threw = true;
+ assert(wasmFrameCountFromError(e) === 2);
+ }
+ assert(threw);
+}
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: numPages})
+ .Function("imp", "func", { params: ["i32"] })
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32", "i32"]})
+ .GetLocal(0)
+ .I32Const(0)
+ .I32Eq()
+ .If("void", b =>
+ b.GetLocal(1)
+ .GetLocal(1)
+ .I32Load(2, 0)
+ .Br(0)
+ .Else()
+ .GetLocal(0)
+ .Call(0)
+ .Br(0)
+ )
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const imp = {
+ imp: {
+ mem: new WebAssembly.Memory({initial: numPages}),
+ func: continuation
+ }
+ };
+ const foo = new WebAssembly.Instance(module, imp).exports.foo;
+ const address = numPages*pageSize + 1;
+ function continuation(x) {
+ foo(x - 1, address);
+ }
+
+ for (let i = 0; i < 10000; i++) {
+ let threw = false;
+ try {
+ foo(25, address);
+ } catch(e) {
+ assert(e instanceof WebAssembly.RuntimeError);
+ assert(e.message === "Out of bounds memory access");
+ // There are 25 total calls, and each call does:
+ // JS entry, wasm entry, js call stub.
+ // The last call that traps just has JS entry and wasm entry.
+ assert(wasmFrameCountFromError(e) === 25 * 3 + 2);
+ threw = true;
+ }
+ assert(threw);
+ }
+}
</ins></span></pre></div>
<a id="trunkJSTestswasmfunctionteststrapstorejs"></a>
<div class="addfile"><h4>Added: trunk/JSTests/wasm/function-tests/trap-store.js (0 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/function-tests/trap-store.js (rev 0)
+++ trunk/JSTests/wasm/function-tests/trap-store.js 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -0,0 +1,97 @@
</span><ins>+import Builder from '../Builder.js'
+
+function assert(b) {
+ if (!b)
+ throw new Error("Bad")
+}
+
+const pageSize = 64 * 1024;
+const numPages = 10;
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("a", "b", {initial: numPages})
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32", "i32"]})
+ .GetLocal(1)
+ .GetLocal(0)
+ .I32Store(2, 0)
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const foo = new WebAssembly.Instance(module, {a: {b: new WebAssembly.Memory({initial: numPages})}}).exports.foo;
+
+ for (let i = 0; i < 10000; i++) {
+ let threw = false;
+ try {
+ foo(i, numPages * pageSize + 1);
+ } catch(e) {
+ assert(e instanceof WebAssembly.RuntimeError);
+ assert(e.message === "Out of bounds memory access");
+ threw = true;
+ }
+ assert(threw);
+ }
+}
+
+
+{
+ const builder = (new Builder())
+ .Type().End()
+ .Import()
+ .Memory("imp", "mem", {initial: numPages})
+ .Function("imp", "func", { params: ["i32"] })
+ .End()
+ .Function().End()
+ .Export().Function("foo").End()
+ .Code()
+ .Function("foo", {params: ["i32", "i32"]})
+ .GetLocal(0)
+ .I32Const(0)
+ .I32Eq()
+ .If("void", b =>
+ b.GetLocal(1)
+ .GetLocal(0)
+ .I32Store(2, 0)
+ .Br(0)
+ .Else()
+ .GetLocal(0)
+ .Call(0)
+ .Br(0)
+ )
+ .End()
+ .End();
+
+ const bin = builder.WebAssembly().get();
+ const module = new WebAssembly.Module(bin);
+ const imp = {
+ imp: {
+ mem: new WebAssembly.Memory({initial: numPages}),
+ func: continuation
+ }
+ };
+ const foo = new WebAssembly.Instance(module, imp).exports.foo;
+ const address = numPages*pageSize + 1;
+ function continuation(x) {
+ foo(x - 1, address);
+ }
+
+ for (let i = 0; i < 10000; i++) {
+ let threw = false;
+ try {
+ foo(25, address);
+ } catch(e) {
+ assert(e instanceof WebAssembly.RuntimeError);
+ assert(e.message === "Out of bounds memory access");
+ threw = true;
+ }
+ assert(threw);
+ }
+}
</ins></span></pre></div>
<a id="trunkJSTestswasmjsapitest_memory_constructorjs"></a>
<div class="modfile"><h4>Modified: trunk/JSTests/wasm/js-api/test_memory_constructor.js (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/JSTests/wasm/js-api/test_memory_constructor.js 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/JSTests/wasm/js-api/test_memory_constructor.js 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -39,9 +39,12 @@
</span><span class="cx"> testInvalidSize({initial: v}, "initial");
</span><span class="cx"> }
</span><span class="cx">
</span><del>- // These should not throw.
- new WebAssembly.Memory({initial: maxPageCount});
- new WebAssembly.Memory({initial: maxPageCount, maximum: maxPageCount});
</del><ins>+ try {
+ new WebAssembly.Memory({initial: maxPageCount});
+ new WebAssembly.Memory({initial: maxPageCount, maximum: maxPageCount});
+ } catch(e) {
+ // These might throw, since we're asking for a lot of memory.
+ }
</ins><span class="cx">
</span><span class="cx"> testInvalidInitial(2**31);
</span><span class="cx"> testInvalidInitial(maxPageCount + 1);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreAPIJSContextRefcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/API/JSContextRef.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/API/JSContextRef.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/API/JSContextRef.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -260,7 +260,7 @@
</span><span class="cx"> if (m_remainingCapacityForFrameCapture) {
</span><span class="cx"> // If callee is unknown, but we've not added any frame yet, we should
</span><span class="cx"> // still add the frame, because something called us, and gave us arguments.
</span><del>- JSObject* callee = visitor->callee();
</del><ins>+ JSCell* callee = visitor->callee();
</ins><span class="cx"> if (!callee && visitor->index())
</span><span class="cx"> return StackVisitor::Done;
</span><span class="cx">
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> builder.append(visitor->functionName());
</span><span class="cx"> builder.appendLiteral("() at ");
</span><span class="cx"> builder.append(visitor->sourceURL());
</span><del>- if (visitor->isJSFrame()) {
</del><ins>+ if (visitor->hasLineAndColumnInfo()) {
</ins><span class="cx"> builder.append(':');
</span><span class="cx"> unsigned lineNumber;
</span><span class="cx"> unsigned unusedColumn;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -1,3 +1,137 @@
</span><ins>+2016-12-11 Saam Barati <sbarati@apple.com>
+
+ We should be able to throw exceptions from Wasm code and when Wasm frames are on the stack
+ https://bugs.webkit.org/show_bug.cgi?id=165429
+
+ Reviewed by Keith Miller.
+
+ This patch teaches the stack walking runtime about wasm.
+ To do this, I taught StackVisitor that a callee is not
+ always an object.
+
+ To be able to unwind callee save registers properly, I've given
+ JSWebAssemblyCallee a list of RegisterAtOffsetList for the callee
+ saves that B3 saved in the prologue. Also, because we have two
+ B3Compilations per wasm function, one for wasm entrypoint, and
+ one for the JS entrypoint, I needed to create a callee for each
+ because they each might spill callee save registers.
+
+ I also fixed a bug inside the Wasm::Memory constructor where we
+ were trying to mmap the same number of bytes even after the first
+ mmap failed. We should start by trying to mmap the maximum bytes,
+ and if that fails, fall back to the specified initial bytes. However,
+ the code was just mmapping the maximum twice. I've fixed that and
+ also added a RELEASE_ASSERT_NOT_REACHED() for when the second mmap
+ fails along with a FIXME to throw an OOM error.
+
+ There was a second bug I fixed where JSModuleRecord was calling
+ visitWeak on its CallLinkInfos inside ::visitChldren(). It needs
+ to do this after marking. I changed JSModuleRecord to do what
+ CodeBlock does and call visitWeak on its CallLinkInfos inside
+ an UnconditionalFinalizer.
+
+ * API/JSContextRef.cpp:
+ (BacktraceFunctor::operator()):
+ * inspector/ScriptCallStackFactory.cpp:
+ (Inspector::createScriptCallStackFromException):
+ * interpreter/CallFrame.cpp:
+ (JSC::CallFrame::vmEntryGlobalObject):
+ * interpreter/CallFrame.h:
+ (JSC::ExecState::callee):
+ * interpreter/Interpreter.cpp:
+ (JSC::GetStackTraceFunctor::operator()):
+ (JSC::UnwindFunctor::operator()):
+ (JSC::UnwindFunctor::copyCalleeSavesToVMEntryFrameCalleeSavesBuffer):
+ * interpreter/Interpreter.h:
+ * interpreter/ShadowChicken.cpp:
+ (JSC::ShadowChicken::update):
+ * interpreter/StackVisitor.cpp:
+ (JSC::StackVisitor::StackVisitor):
+ (JSC::StackVisitor::readFrame):
+ (JSC::StackVisitor::readNonInlinedFrame):
+ (JSC::StackVisitor::readInlinedFrame):
+ (JSC::StackVisitor::Frame::isWasmFrame):
+ (JSC::StackVisitor::Frame::codeType):
+ (JSC::StackVisitor::Frame::calleeSaveRegisters):
+ (JSC::StackVisitor::Frame::functionName):
+ (JSC::StackVisitor::Frame::sourceURL):
+ (JSC::StackVisitor::Frame::toString):
+ (JSC::StackVisitor::Frame::hasLineAndColumnInfo):
+ (JSC::StackVisitor::Frame::setToEnd):
+ * interpreter/StackVisitor.h:
+ (JSC::StackVisitor::Frame::callee):
+ (JSC::StackVisitor::Frame::isNativeFrame):
+ (JSC::StackVisitor::Frame::isJSFrame): Deleted.
+ * jsc.cpp:
+ (callWasmFunction):
+ (functionTestWasmModuleFunctions):
+ * runtime/Error.cpp:
+ (JSC::addErrorInfoAndGetBytecodeOffset):
+ * runtime/JSCell.cpp:
+ (JSC::JSCell::isAnyWasmCallee):
+ * runtime/JSCell.h:
+ * runtime/JSFunction.cpp:
+ (JSC::RetrieveArgumentsFunctor::operator()):
+ (JSC::RetrieveCallerFunctionFunctor::operator()):
+ * runtime/StackFrame.cpp:
+ (JSC::StackFrame::sourceID):
+ (JSC::StackFrame::sourceURL):
+ (JSC::StackFrame::functionName):
+ (JSC::StackFrame::computeLineAndColumn):
+ (JSC::StackFrame::toString):
+ * runtime/StackFrame.h:
+ (JSC::StackFrame::StackFrame):
+ (JSC::StackFrame::hasLineAndColumnInfo):
+ (JSC::StackFrame::hasBytecodeOffset):
+ (JSC::StackFrame::bytecodeOffset):
+ (JSC::StackFrame::isNative): Deleted.
+ * runtime/VM.h:
+ * wasm/WasmB3IRGenerator.cpp:
+ (JSC::Wasm::B3IRGenerator::B3IRGenerator):
+ (JSC::Wasm::createJSToWasmWrapper):
+ (JSC::Wasm::parseAndCompile):
+ * wasm/WasmCallingConvention.h:
+ (JSC::Wasm::CallingConvention::setupFrameInPrologue):
+ * wasm/WasmFormat.h:
+ * wasm/WasmMemory.cpp:
+ (JSC::Wasm::Memory::Memory):
+ * wasm/WasmMemory.h:
+ (JSC::Wasm::Memory::isValid):
+ * wasm/WasmPlan.cpp:
+ (JSC::Wasm::Plan::run):
+ (JSC::Wasm::Plan::initializeCallees):
+ * wasm/WasmPlan.h:
+ (JSC::Wasm::Plan::jsToWasmEntryPointForFunction): Deleted.
+ * wasm/js/JSWebAssemblyCallee.cpp:
+ (JSC::JSWebAssemblyCallee::finishCreation):
+ * wasm/js/JSWebAssemblyCallee.h:
+ (JSC::JSWebAssemblyCallee::create):
+ (JSC::JSWebAssemblyCallee::entrypoint):
+ (JSC::JSWebAssemblyCallee::calleeSaveRegisters):
+ (JSC::JSWebAssemblyCallee::jsToWasmEntryPoint): Deleted.
+ * wasm/js/JSWebAssemblyModule.cpp:
+ (JSC::JSWebAssemblyModule::JSWebAssemblyModule):
+ (JSC::JSWebAssemblyModule::visitChildren):
+ (JSC::JSWebAssemblyModule::UnconditionalFinalizer::finalizeUnconditionally):
+ * wasm/js/JSWebAssemblyModule.h:
+ (JSC::JSWebAssemblyModule::jsEntrypointCalleeFromFunctionIndexSpace):
+ (JSC::JSWebAssemblyModule::wasmEntrypointCalleeFromFunctionIndexSpace):
+ (JSC::JSWebAssemblyModule::setJSEntrypointCallee):
+ (JSC::JSWebAssemblyModule::setWasmEntrypointCallee):
+ (JSC::JSWebAssemblyModule::allocationSize):
+ (JSC::JSWebAssemblyModule::calleeFromFunctionIndexSpace): Deleted.
+ * wasm/js/JSWebAssemblyRuntimeError.h:
+ * wasm/js/WebAssemblyFunction.cpp:
+ (JSC::WebAssemblyFunction::call):
+ * wasm/js/WebAssemblyInstanceConstructor.cpp:
+ (JSC::constructJSWebAssemblyInstance):
+ * wasm/js/WebAssemblyMemoryConstructor.cpp:
+ (JSC::constructJSWebAssemblyMemory):
+ * wasm/js/WebAssemblyModuleConstructor.cpp:
+ (JSC::constructJSWebAssemblyModule):
+ * wasm/js/WebAssemblyModuleRecord.cpp:
+ (JSC::WebAssemblyModuleRecord::link):
+
</ins><span class="cx"> 2016-12-11 Filip Pizlo <fpizlo@apple.com>
</span><span class="cx">
</span><span class="cx"> Re-enable concurrent GC.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorScriptCallStackFactorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/inspector/ScriptCallStackFactory.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -156,7 +156,7 @@
</span><span class="cx"> extractSourceInformationFromException(exec, exceptionObject, &lineNumber, &columnNumber, &exceptionSourceURL);
</span><span class="cx"> frames.append(ScriptCallFrame(String(), exceptionSourceURL, noSourceID, lineNumber, columnNumber));
</span><span class="cx"> } else {
</span><del>- if (stackTrace[0].isNative() || stackTrace[0].sourceURL().isEmpty()) {
</del><ins>+ if (!stackTrace[0].hasLineAndColumnInfo() || stackTrace[0].sourceURL().isEmpty()) {
</ins><span class="cx"> const ScriptCallFrame& firstCallFrame = frames.first();
</span><span class="cx"> extractSourceInformationFromException(exec, exceptionObject, &lineNumber, &columnNumber, &exceptionSourceURL);
</span><span class="cx"> frames[0] = ScriptCallFrame(firstCallFrame.functionName(), exceptionSourceURL, stackTrace[0].sourceID(), lineNumber, columnNumber);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -185,8 +185,11 @@
</span><span class="cx">
</span><span class="cx"> JSGlobalObject* CallFrame::vmEntryGlobalObject()
</span><span class="cx"> {
</span><del>- if (this == lexicalGlobalObject()->globalExec())
- return lexicalGlobalObject();
</del><ins>+ if (callee()->isObject()) {
+ if (this == lexicalGlobalObject()->globalExec())
+ return lexicalGlobalObject();
+ }
+ // If we're not an object, we're wasm, and therefore we're executing code and the below is safe.
</ins><span class="cx">
</span><span class="cx"> // For any ExecState that's not a globalExec, the
</span><span class="cx"> // dynamic global object must be set since code is running
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterCallFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/CallFrame.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/CallFrame.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/interpreter/CallFrame.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -86,9 +86,9 @@
</span><span class="cx"> public:
</span><span class="cx"> static const int headerSizeInRegisters = CallFrameSlot::argumentCount + 1;
</span><span class="cx">
</span><del>- JSCell* callee() const { return this[CallFrameSlot::callee].unboxedCell(); }
</del><span class="cx"> JSValue calleeAsValue() const { return this[CallFrameSlot::callee].jsValue(); }
</span><span class="cx"> JSObject* jsCallee() const { return this[CallFrameSlot::callee].object(); }
</span><ins>+ JSCell* callee() const { return this[CallFrameSlot::callee].unboxedCell(); }
</ins><span class="cx"> SUPPRESS_ASAN JSValue unsafeCallee() const { return this[CallFrameSlot::callee].asanUnsafeJSValue(); }
</span><span class="cx"> CodeBlock* codeBlock() const { return this[CallFrameSlot::codeBlock].Register::codeBlock(); }
</span><span class="cx"> CodeBlock** addressOfCodeBlock() const { return bitwise_cast<CodeBlock**>(this + CallFrameSlot::codeBlock); }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpretercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> #include "Register.h"
</span><span class="cx"> #include "ScopedArguments.h"
</span><span class="cx"> #include "StackAlignment.h"
</span><ins>+#include "StackFrame.h"
</ins><span class="cx"> #include "StackVisitor.h"
</span><span class="cx"> #include "StrictEvalActivation.h"
</span><span class="cx"> #include "StrongInlines.h"
</span><span class="lines">@@ -466,21 +467,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_remainingCapacityForFrameCapture) {
</span><del>- if (visitor->isJSFrame()
</del><ins>+ if (!visitor->isWasmFrame()
+ && !!visitor->codeBlock()
</ins><span class="cx"> && !visitor->codeBlock()->unlinkedCodeBlock()->isBuiltinFunction()) {
</span><del>- StackFrame s = {
- Strong<JSObject>(m_vm, visitor->callee()),
- Strong<CodeBlock>(m_vm, visitor->codeBlock()),
- visitor->bytecodeOffset()
- };
- m_results.append(s);
</del><ins>+ m_results.append(
+ StackFrame(m_vm, visitor->callee(), visitor->codeBlock(), visitor->bytecodeOffset()));
</ins><span class="cx"> } else {
</span><del>- StackFrame s = {
- Strong<JSObject>(m_vm, visitor->callee()),
- Strong<CodeBlock>(),
- 0 // unused value because codeBlock is null.
- };
- m_results.append(s);
</del><ins>+ m_results.append(
+ StackFrame(m_vm, visitor->callee()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_remainingCapacityForFrameCapture--;
</span><span class="lines">@@ -608,24 +602,21 @@
</span><span class="cx">
</span><span class="cx"> m_handler = nullptr;
</span><span class="cx"> if (!m_isTermination) {
</span><del>- if (m_codeBlock)
</del><ins>+ if (m_codeBlock) {
</ins><span class="cx"> m_handler = findExceptionHandler(visitor, m_codeBlock, RequiredHandler::AnyHandler);
</span><ins>+ if (m_handler)
+ return StackVisitor::Done;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- if (m_handler)
- return StackVisitor::Done;
-
</del><span class="cx"> notifyDebuggerOfUnwinding(m_callFrame);
</span><span class="cx">
</span><ins>+ copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(visitor);
+
</ins><span class="cx"> bool shouldStopUnwinding = visitor->callerIsVMEntryFrame();
</span><del>- if (shouldStopUnwinding) {
- copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(visitor);
-
</del><ins>+ if (shouldStopUnwinding)
</ins><span class="cx"> return StackVisitor::Done;
</span><del>- }
</del><span class="cx">
</span><del>- copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(visitor);
-
</del><span class="cx"> return StackVisitor::Continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -633,16 +624,8 @@
</span><span class="cx"> void copyCalleeSavesToVMEntryFrameCalleeSavesBuffer(StackVisitor& visitor) const
</span><span class="cx"> {
</span><span class="cx"> #if ENABLE(JIT) && NUMBER_OF_CALLEE_SAVES_REGISTERS > 0
</span><ins>+ RegisterAtOffsetList* currentCalleeSaves = visitor->calleeSaveRegisters();
</ins><span class="cx">
</span><del>- if (!visitor->isJSFrame())
- return;
-
-#if ENABLE(DFG_JIT)
- if (visitor->inlineCallFrame())
- return;
-#endif
- RegisterAtOffsetList* currentCalleeSaves = m_codeBlock ? m_codeBlock->calleeSaveRegisters() : nullptr;
-
</del><span class="cx"> if (!currentCalleeSaves)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterInterpreterh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/Interpreter.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/interpreter/Interpreter.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -37,7 +37,6 @@
</span><span class="cx"> #include "JSObject.h"
</span><span class="cx"> #include "Opcode.h"
</span><span class="cx"> #include "StackAlignment.h"
</span><del>-#include "StackFrame.h"
</del><span class="cx"> #include <wtf/HashMap.h>
</span><span class="cx">
</span><span class="cx"> #if !ENABLE(JIT)
</span><span class="lines">@@ -60,6 +59,7 @@
</span><span class="cx"> class ModuleProgramExecutable;
</span><span class="cx"> class Register;
</span><span class="cx"> class JSScope;
</span><ins>+ class StackFrame;
</ins><span class="cx"> struct CallFrameClosure;
</span><span class="cx"> struct HandlerInfo;
</span><span class="cx"> struct Instruction;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterShadowChickencpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/interpreter/ShadowChicken.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -155,8 +155,16 @@
</span><span class="cx"> exec, [&] (StackVisitor& visitor) -> StackVisitor::Status {
</span><span class="cx"> if (visitor->isInlinedFrame())
</span><span class="cx"> return StackVisitor::Continue;
</span><ins>+ if (visitor->isWasmFrame()) {
+ // FIXME: Make shadow chicken work with Wasm.
+ // https://bugs.webkit.org/show_bug.cgi?id=165441
+ return StackVisitor::Continue;
+ }
+
</ins><span class="cx"> bool isTailDeleted = false;
</span><del>- stackRightNow.append(Frame(visitor->callee(), visitor->callFrame(), isTailDeleted));
</del><ins>+ // FIXME: Make shadow chicken work with Wasm.
+ // https://bugs.webkit.org/show_bug.cgi?id=165441
+ stackRightNow.append(Frame(jsCast<JSObject*>(visitor->callee()), visitor->callFrame(), isTailDeleted));
</ins><span class="cx"> return StackVisitor::Continue;
</span><span class="cx"> });
</span><span class="cx"> stackRightNow.reverse();
</span><span class="lines">@@ -272,6 +280,11 @@
</span><span class="cx"> return StackVisitor::Continue;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (visitor->isWasmFrame()) {
+ // FIXME: Make shadow chicken work with Wasm.
+ return StackVisitor::Continue;
+ }
+
</ins><span class="cx"> CallFrame* callFrame = visitor->callFrame();
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog(" Examining ", RawPointer(callFrame), "\n");
</span><span class="lines">@@ -293,7 +306,7 @@
</span><span class="cx"> if (scope)
</span><span class="cx"> RELEASE_ASSERT(scope->inherits(JSScope::info()));
</span><span class="cx"> }
</span><del>- toPush.append(Frame(visitor->callee(), callFrame, isTailDeleted, callFrame->thisValue(), scope, codeBlock, callFrame->callSiteIndex()));
</del><ins>+ toPush.append(Frame(jsCast<JSObject*>(visitor->callee()), callFrame, isTailDeleted, callFrame->thisValue(), scope, codeBlock, callFrame->callSiteIndex()));
</ins><span class="cx">
</span><span class="cx"> if (indexInLog < logCursorIndex
</span><span class="cx"> // This condition protects us from the case where advanceIndexInLogTo didn't find
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> #include "InlineCallFrame.h"
</span><span class="cx"> #include "Interpreter.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><ins>+#include "JSWebAssemblyCallee.h"
</ins><span class="cx"> #include <wtf/text/StringBuilder.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -38,6 +39,7 @@
</span><span class="cx"> StackVisitor::StackVisitor(CallFrame* startFrame)
</span><span class="cx"> {
</span><span class="cx"> m_frame.m_index = 0;
</span><ins>+ m_frame.m_isWasmFrame = false;
</ins><span class="cx"> CallFrame* topFrame;
</span><span class="cx"> if (startFrame) {
</span><span class="cx"> m_frame.m_VMEntryFrame = startFrame->vm().topVMEntryFrame;
</span><span class="lines">@@ -101,6 +103,11 @@
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (callFrame->callee()->isAnyWasmCallee()) {
+ readNonInlinedFrame(callFrame);
+ return;
+ }
+
</ins><span class="cx"> #if !ENABLE(DFG_JIT)
</span><span class="cx"> readNonInlinedFrame(callFrame);
</span><span class="cx">
</span><span class="lines">@@ -146,11 +153,23 @@
</span><span class="cx"> m_frame.m_CallerVMEntryFrame = m_frame.m_VMEntryFrame;
</span><span class="cx"> m_frame.m_callerFrame = callFrame->callerFrame(m_frame.m_CallerVMEntryFrame);
</span><span class="cx"> m_frame.m_callerIsVMEntryFrame = m_frame.m_CallerVMEntryFrame != m_frame.m_VMEntryFrame;
</span><del>- m_frame.m_callee = callFrame->jsCallee();
- m_frame.m_codeBlock = callFrame->codeBlock();
- m_frame.m_bytecodeOffset = !m_frame.codeBlock() ? 0
- : codeOrigin ? codeOrigin->bytecodeIndex
- : callFrame->bytecodeOffset();
</del><ins>+ m_frame.m_isWasmFrame = false;
+
+ JSCell* callee = callFrame->callee();
+ m_frame.m_callee = callee;
+
+ if (callee->isAnyWasmCallee()) {
+ m_frame.m_isWasmFrame = true;
+ m_frame.m_codeBlock = nullptr;
+ m_frame.m_bytecodeOffset = 0;
+ } else {
+ m_frame.m_codeBlock = callFrame->codeBlock();
+ m_frame.m_bytecodeOffset = !m_frame.codeBlock() ? 0
+ : codeOrigin ? codeOrigin->bytecodeIndex
+ : callFrame->bytecodeOffset();
+
+ }
+
</ins><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> m_frame.m_inlineCallFrame = 0;
</span><span class="cx"> #endif
</span><span class="lines">@@ -167,6 +186,7 @@
</span><span class="cx"> void StackVisitor::readInlinedFrame(CallFrame* callFrame, CodeOrigin* codeOrigin)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(codeOrigin);
</span><ins>+ m_frame.m_isWasmFrame = false;
</ins><span class="cx">
</span><span class="cx"> int frameOffset = inlinedFrameOffset(codeOrigin);
</span><span class="cx"> bool isInlined = !!frameOffset;
</span><span class="lines">@@ -198,9 +218,17 @@
</span><span class="cx"> }
</span><span class="cx"> #endif // ENABLE(DFG_JIT)
</span><span class="cx">
</span><ins>+bool StackVisitor::Frame::isWasmFrame() const
+{
+ return m_isWasmFrame;
+}
+
</ins><span class="cx"> StackVisitor::Frame::CodeType StackVisitor::Frame::codeType() const
</span><span class="cx"> {
</span><del>- if (!isJSFrame())
</del><ins>+ if (isWasmFrame())
+ return CodeType::Wasm;
+
+ if (!codeBlock())
</ins><span class="cx"> return CodeType::Native;
</span><span class="cx">
</span><span class="cx"> switch (codeBlock()->codeType()) {
</span><span class="lines">@@ -217,12 +245,39 @@
</span><span class="cx"> return CodeType::Global;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+RegisterAtOffsetList* StackVisitor::Frame::calleeSaveRegisters()
+{
+ if (isInlinedFrame())
+ return nullptr;
+
+#if ENABLE(WEBASSEMBLY)
+ if (isWasmFrame()) {
+ if (JSCell* callee = this->callee()) {
+ if (JSWebAssemblyCallee* wasmCallee = jsDynamicCast<JSWebAssemblyCallee*>(callee))
+ return wasmCallee->calleeSaveRegisters();
+ // Other wasm callees (e.g, stubs) don't use callee save registers, so nothing needs
+ // to be restored for them.
+ }
+
+ return nullptr;
+ }
+#endif
+
+ if (CodeBlock* codeBlock = this->codeBlock())
+ return codeBlock->calleeSaveRegisters();
+
+ return nullptr;
+}
+
</ins><span class="cx"> String StackVisitor::Frame::functionName() const
</span><span class="cx"> {
</span><span class="cx"> String traceLine;
</span><del>- JSObject* callee = this->callee();
</del><ins>+ JSCell* callee = this->callee();
</ins><span class="cx">
</span><span class="cx"> switch (codeType()) {
</span><ins>+ case CodeType::Wasm:
+ traceLine = ASCIILiteral("wasm code");
+ break;
</ins><span class="cx"> case CodeType::Eval:
</span><span class="cx"> traceLine = ASCIILiteral("eval code");
</span><span class="cx"> break;
</span><span class="lines">@@ -231,10 +286,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case CodeType::Native:
</span><span class="cx"> if (callee)
</span><del>- traceLine = getCalculatedDisplayName(callFrame()->vm(), callee).impl();
</del><ins>+ traceLine = getCalculatedDisplayName(callFrame()->vm(), jsCast<JSObject*>(callee)).impl();
</ins><span class="cx"> break;
</span><span class="cx"> case CodeType::Function:
</span><del>- traceLine = getCalculatedDisplayName(callFrame()->vm(), callee).impl();
</del><ins>+ traceLine = getCalculatedDisplayName(callFrame()->vm(), jsCast<JSObject*>(callee)).impl();
</ins><span class="cx"> break;
</span><span class="cx"> case CodeType::Global:
</span><span class="cx"> traceLine = ASCIILiteral("global code");
</span><span class="lines">@@ -260,6 +315,9 @@
</span><span class="cx"> case CodeType::Native:
</span><span class="cx"> traceLine = ASCIILiteral("[native code]");
</span><span class="cx"> break;
</span><ins>+ case CodeType::Wasm:
+ traceLine = ASCIILiteral("[wasm code]");
+ break;
</ins><span class="cx"> }
</span><span class="cx"> return traceLine.isNull() ? emptyString() : traceLine;
</span><span class="cx"> }
</span><span class="lines">@@ -274,7 +332,7 @@
</span><span class="cx"> if (!functionName.isEmpty())
</span><span class="cx"> traceBuild.append('@');
</span><span class="cx"> traceBuild.append(sourceURL);
</span><del>- if (isJSFrame()) {
</del><ins>+ if (hasLineAndColumnInfo()) {
</ins><span class="cx"> unsigned line = 0;
</span><span class="cx"> unsigned column = 0;
</span><span class="cx"> computeLineAndColumn(line, column);
</span><span class="lines">@@ -314,6 +372,11 @@
</span><span class="cx"> return arguments;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool StackVisitor::Frame::hasLineAndColumnInfo() const
+{
+ return !!codeBlock();
+}
+
</ins><span class="cx"> void StackVisitor::Frame::computeLineAndColumn(unsigned& line, unsigned& column) const
</span><span class="cx"> {
</span><span class="cx"> CodeBlock* codeBlock = this->codeBlock();
</span><span class="lines">@@ -350,6 +413,7 @@
</span><span class="cx"> #if ENABLE(DFG_JIT)
</span><span class="cx"> m_inlineCallFrame = 0;
</span><span class="cx"> #endif
</span><ins>+ m_isWasmFrame = false;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StackVisitor::Frame::dump(PrintStream& out, Indenter indent) const
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinterpreterStackVisitorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/interpreter/StackVisitor.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/interpreter/StackVisitor.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/interpreter/StackVisitor.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -41,6 +41,7 @@
</span><span class="cx"> class JSObject;
</span><span class="cx"> class ClonedArguments;
</span><span class="cx"> class Register;
</span><ins>+class RegisterAtOffsetList;
</ins><span class="cx">
</span><span class="cx"> typedef ExecState CallFrame;
</span><span class="cx">
</span><span class="lines">@@ -53,7 +54,8 @@
</span><span class="cx"> Eval,
</span><span class="cx"> Function,
</span><span class="cx"> Module,
</span><del>- Native
</del><ins>+ Native,
+ Wasm
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> size_t index() const { return m_index; }
</span><span class="lines">@@ -60,7 +62,7 @@
</span><span class="cx"> size_t argumentCountIncludingThis() const { return m_argumentCountIncludingThis; }
</span><span class="cx"> bool callerIsVMEntryFrame() const { return m_callerIsVMEntryFrame; }
</span><span class="cx"> CallFrame* callerFrame() const { return m_callerFrame; }
</span><del>- JSObject* callee() const { return m_callee; }
</del><ins>+ JSCell* callee() const { return m_callee; }
</ins><span class="cx"> CodeBlock* codeBlock() const { return m_codeBlock; }
</span><span class="cx"> unsigned bytecodeOffset() const { return m_bytecodeOffset; }
</span><span class="cx"> InlineCallFrame* inlineCallFrame() const {
</span><span class="lines">@@ -71,8 +73,9 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>- bool isJSFrame() const { return !!codeBlock(); }
</del><ins>+ bool isNativeFrame() const { return !codeBlock() && !isWasmFrame(); }
</ins><span class="cx"> bool isInlinedFrame() const { return !!inlineCallFrame(); }
</span><ins>+ bool isWasmFrame() const;
</ins><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE String functionName() const;
</span><span class="cx"> JS_EXPORT_PRIVATE String sourceURL() const;
</span><span class="lines">@@ -81,8 +84,11 @@
</span><span class="cx"> intptr_t sourceID();
</span><span class="cx">
</span><span class="cx"> CodeType codeType() const;
</span><ins>+ bool hasLineAndColumnInfo() const;
</ins><span class="cx"> JS_EXPORT_PRIVATE void computeLineAndColumn(unsigned& line, unsigned& column) const;
</span><span class="cx">
</span><ins>+ RegisterAtOffsetList* calleeSaveRegisters();
+
</ins><span class="cx"> ClonedArguments* createArguments();
</span><span class="cx"> VMEntryFrame* vmEntryFrame() const { return m_VMEntryFrame; }
</span><span class="cx"> CallFrame* callFrame() const { return m_callFrame; }
</span><span class="lines">@@ -97,19 +103,20 @@
</span><span class="cx"> void retrieveExpressionInfo(int& divot, int& startOffset, int& endOffset, unsigned& line, unsigned& column) const;
</span><span class="cx"> void setToEnd();
</span><span class="cx">
</span><del>- size_t m_index;
- size_t m_argumentCountIncludingThis;
</del><ins>+#if ENABLE(DFG_JIT)
+ InlineCallFrame* m_inlineCallFrame;
+#endif
+ CallFrame* m_callFrame;
</ins><span class="cx"> VMEntryFrame* m_VMEntryFrame;
</span><span class="cx"> VMEntryFrame* m_CallerVMEntryFrame;
</span><span class="cx"> CallFrame* m_callerFrame;
</span><del>- JSObject* m_callee;
</del><ins>+ JSCell* m_callee;
</ins><span class="cx"> CodeBlock* m_codeBlock;
</span><ins>+ size_t m_index;
+ size_t m_argumentCountIncludingThis;
</ins><span class="cx"> unsigned m_bytecodeOffset;
</span><del>- bool m_callerIsVMEntryFrame;
-#if ENABLE(DFG_JIT)
- InlineCallFrame* m_inlineCallFrame;
-#endif
- CallFrame* m_callFrame;
</del><ins>+ bool m_callerIsVMEntryFrame : 1;
+ bool m_isWasmFrame : 1;
</ins><span class="cx">
</span><span class="cx"> friend class StackVisitor;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorejsccpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/jsc.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/jsc.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/jsc.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -2593,7 +2593,7 @@
</span><span class="cx"> ProtoCallFrame protoCallFrame;
</span><span class="cx"> protoCallFrame.init(nullptr, globalObject->globalExec()->jsCallee(), firstArgument, argCount, remainingArgs);
</span><span class="cx">
</span><del>- return JSValue::decode(vmEntryToWasm(wasmCallee->jsToWasmEntryPoint(), vm, &protoCallFrame));
</del><ins>+ return JSValue::decode(vmEntryToWasm(wasmCallee->entrypoint(), vm, &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">@@ -2623,12 +2623,14 @@
</span><span class="cx"> CRASH();
</span><span class="cx">
</span><span class="cx"> MarkedArgumentBuffer callees;
</span><ins>+ MarkedArgumentBuffer keepAlive;
</ins><span class="cx"> {
</span><span class="cx"> unsigned lastIndex = UINT_MAX;
</span><span class="cx"> plan.initializeCallees(exec->lexicalGlobalObject(),
</span><del>- [&] (unsigned calleeIndex, JSWebAssemblyCallee* callee) {
</del><ins>+ [&] (unsigned calleeIndex, JSWebAssemblyCallee* jsEntrypointCallee, JSWebAssemblyCallee* wasmEntrypointCallee) {
</ins><span class="cx"> RELEASE_ASSERT(!calleeIndex || (calleeIndex - 1 == lastIndex));
</span><del>- callees.append(callee);
</del><ins>+ callees.append(jsEntrypointCallee);
+ keepAlive.append(wasmEntrypointCallee);
</ins><span class="cx"> lastIndex = calleeIndex;
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -2640,6 +2642,7 @@
</span><span class="cx">
</span><span class="cx"> if (!!moduleInformation->memory) {
</span><span class="cx"> memory = std::make_unique<Wasm::Memory>(moduleInformation->memory.initial(), moduleInformation->memory.maximum());
</span><ins>+ RELEASE_ASSERT(memory->isValid());
</ins><span class="cx"> memoryBytes = memory->memory();
</span><span class="cx"> memorySize = memory->size();
</span><span class="cx"> }
</span><span class="lines">@@ -2657,7 +2660,12 @@
</span><span class="cx"> for (unsigned argIndex = 0; argIndex < arguments->length(); ++argIndex)
</span><span class="cx"> boxedArgs.append(box(exec, vm, arguments->getIndexQuickly(argIndex)));
</span><span class="cx">
</span><del>- JSValue callResult = callWasmFunction(&vm, exec->lexicalGlobalObject(), jsCast<JSWebAssemblyCallee*>(callees.at(i)), boxedArgs);
</del><ins>+ JSValue callResult;
+ {
+ auto scope = DECLARE_THROW_SCOPE(vm);
+ callResult = callWasmFunction(&vm, exec->lexicalGlobalObject(), jsCast<JSWebAssemblyCallee*>(callees.at(i)), boxedArgs);
+ RETURN_IF_EXCEPTION(scope, { });
+ }
</ins><span class="cx"> JSValue expected = box(exec, vm, result);
</span><span class="cx"> if (callResult != expected) {
</span><span class="cx"> dataLog("Arguments: ");
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Error.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Error.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/runtime/Error.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -165,10 +165,10 @@
</span><span class="cx">
</span><span class="cx"> ASSERT(exec == vm.topCallFrame || exec == exec->lexicalGlobalObject()->globalExec() || exec == exec->vmEntryGlobalObject()->globalExec());
</span><span class="cx">
</span><del>- StackFrame* firstNonNativeFrame = nullptr;
</del><ins>+ StackFrame* firstFrameWithLineAndColumnInfo = nullptr;
</ins><span class="cx"> for (unsigned i = 0 ; i < stackTrace.size(); ++i) {
</span><del>- firstNonNativeFrame = &stackTrace.at(i);
- if (!firstNonNativeFrame->isNative())
</del><ins>+ firstFrameWithLineAndColumnInfo = &stackTrace.at(i);
+ if (firstFrameWithLineAndColumnInfo->hasLineAndColumnInfo())
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -177,16 +177,18 @@
</span><span class="cx"> vm.topCallFrame->iterate(functor);
</span><span class="cx"> callFrame = functor.foundCallFrame();
</span><span class="cx"> unsigned stackIndex = functor.index();
</span><del>- *bytecodeOffset = stackTrace.at(stackIndex).bytecodeOffset;
</del><ins>+ *bytecodeOffset = 0;
+ if (stackTrace.at(stackIndex).hasBytecodeOffset())
+ *bytecodeOffset = stackTrace.at(stackIndex).bytecodeOffset();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> unsigned line;
</span><span class="cx"> unsigned column;
</span><del>- firstNonNativeFrame->computeLineAndColumn(line, column);
</del><ins>+ firstFrameWithLineAndColumnInfo->computeLineAndColumn(line, column);
</ins><span class="cx"> obj->putDirect(vm, vm.propertyNames->line, jsNumber(line));
</span><span class="cx"> obj->putDirect(vm, vm.propertyNames->column, jsNumber(column));
</span><span class="cx">
</span><del>- String frameSourceURL = firstNonNativeFrame->sourceURL();
</del><ins>+ String frameSourceURL = firstFrameWithLineAndColumnInfo->sourceURL();
</ins><span class="cx"> if (!frameSourceURL.isEmpty())
</span><span class="cx"> obj->putDirect(vm, vm.propertyNames->sourceURL, jsString(&vm, frameSourceURL));
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -24,11 +24,13 @@
</span><span class="cx"> #include "JSCell.h"
</span><span class="cx">
</span><span class="cx"> #include "ArrayBufferView.h"
</span><ins>+#include "JSCInlines.h"
</ins><span class="cx"> #include "JSFunction.h"
</span><span class="cx"> #include "JSString.h"
</span><span class="cx"> #include "JSObject.h"
</span><ins>+#include "JSWebAssemblyCallee.h"
</ins><span class="cx"> #include "NumberObject.h"
</span><del>-#include "JSCInlines.h"
</del><ins>+#include "WebAssemblyToJSCallee.h"
</ins><span class="cx"> #include <wtf/MathExtras.h>
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -293,4 +295,14 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+bool JSCell::isAnyWasmCallee() const
+{
+#if ENABLE(WEBASSEMBLY)
+ return inherits(JSWebAssemblyCallee::info()) || inherits(WebAssemblyToJSCallee::info());
+#else
+ return false;
+#endif
+
+}
+
</ins><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSCellh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSCell.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSCell.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/runtime/JSCell.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -95,6 +95,7 @@
</span><span class="cx"> bool isString() const;
</span><span class="cx"> bool isSymbol() const;
</span><span class="cx"> bool isObject() const;
</span><ins>+ bool isAnyWasmCallee() const;
</ins><span class="cx"> bool isGetterSetter() const;
</span><span class="cx"> bool isCustomGetterSetter() const;
</span><span class="cx"> bool isProxy() const;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeJSFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/JSFunction.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/runtime/JSFunction.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -235,7 +235,7 @@
</span><span class="cx">
</span><span class="cx"> StackVisitor::Status operator()(StackVisitor& visitor) const
</span><span class="cx"> {
</span><del>- JSObject* callee = visitor->callee();
</del><ins>+ JSCell* callee = visitor->callee();
</ins><span class="cx"> if (callee != m_targetCallee)
</span><span class="cx"> return StackVisitor::Continue;
</span><span class="cx">
</span><span class="lines">@@ -277,7 +277,7 @@
</span><span class="cx">
</span><span class="cx"> StackVisitor::Status operator()(StackVisitor& visitor) const
</span><span class="cx"> {
</span><del>- JSObject* callee = visitor->callee();
</del><ins>+ JSCell* callee = visitor->callee();
</ins><span class="cx">
</span><span class="cx"> if (callee && callee->inherits(JSBoundFunction::info()))
</span><span class="cx"> return StackVisitor::Continue;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStackFramecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StackFrame.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StackFrame.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/runtime/StackFrame.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -35,17 +35,20 @@
</span><span class="cx">
</span><span class="cx"> intptr_t StackFrame::sourceID() const
</span><span class="cx"> {
</span><del>- if (!codeBlock)
</del><ins>+ if (!m_codeBlock)
</ins><span class="cx"> return noSourceID;
</span><del>- return codeBlock->ownerScriptExecutable()->sourceID();
</del><ins>+ return m_codeBlock->ownerScriptExecutable()->sourceID();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String StackFrame::sourceURL() const
</span><span class="cx"> {
</span><del>- if (!codeBlock)
</del><ins>+ if (!m_codeBlock) {
+ if (m_callee && m_callee->isAnyWasmCallee())
+ return ASCIILiteral("[wasm code]");
</ins><span class="cx"> return ASCIILiteral("[native code]");
</span><ins>+ }
</ins><span class="cx">
</span><del>- String sourceURL = codeBlock->ownerScriptExecutable()->sourceURL();
</del><ins>+ String sourceURL = m_codeBlock->ownerScriptExecutable()->sourceURL();
</ins><span class="cx"> if (!sourceURL.isNull())
</span><span class="cx"> return sourceURL;
</span><span class="cx"> return emptyString();
</span><span class="lines">@@ -53,8 +56,8 @@
</span><span class="cx">
</span><span class="cx"> String StackFrame::functionName(VM& vm) const
</span><span class="cx"> {
</span><del>- if (codeBlock) {
- switch (codeBlock->codeType()) {
</del><ins>+ if (m_codeBlock) {
+ switch (m_codeBlock->codeType()) {
</ins><span class="cx"> case EvalCode:
</span><span class="cx"> return ASCIILiteral("eval code");
</span><span class="cx"> case ModuleCode:
</span><span class="lines">@@ -68,14 +71,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> String name;
</span><del>- if (callee)
- name = getCalculatedDisplayName(vm, callee.get()).impl();
</del><ins>+ if (m_callee) {
+ if (m_callee->isObject())
+ name = getCalculatedDisplayName(vm, jsCast<JSObject*>(m_callee.get())).impl();
+ else if (m_callee->isAnyWasmCallee())
+ return ASCIILiteral("<wasm>");
+ }
</ins><span class="cx"> return name.isNull() ? emptyString() : name;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void StackFrame::computeLineAndColumn(unsigned& line, unsigned& column) const
</span><span class="cx"> {
</span><del>- if (!codeBlock) {
</del><ins>+ if (!m_codeBlock) {
</ins><span class="cx"> line = 0;
</span><span class="cx"> column = 0;
</span><span class="cx"> return;
</span><span class="lines">@@ -84,9 +91,9 @@
</span><span class="cx"> int divot = 0;
</span><span class="cx"> int unusedStartOffset = 0;
</span><span class="cx"> int unusedEndOffset = 0;
</span><del>- codeBlock->expressionRangeForBytecodeOffset(bytecodeOffset, divot, unusedStartOffset, unusedEndOffset, line, column);
</del><ins>+ m_codeBlock->expressionRangeForBytecodeOffset(m_bytecodeOffset, divot, unusedStartOffset, unusedEndOffset, line, column);
</ins><span class="cx">
</span><del>- ScriptExecutable* executable = codeBlock->ownerScriptExecutable();
</del><ins>+ ScriptExecutable* executable = m_codeBlock->ownerScriptExecutable();
</ins><span class="cx"> if (executable->hasOverrideLineNumber())
</span><span class="cx"> line = executable->overrideLineNumber();
</span><span class="cx"> }
</span><span class="lines">@@ -101,7 +108,7 @@
</span><span class="cx"> if (!functionName.isEmpty())
</span><span class="cx"> traceBuild.append('@');
</span><span class="cx"> traceBuild.append(sourceURL);
</span><del>- if (codeBlock) {
</del><ins>+ if (hasLineAndColumnInfo()) {
</ins><span class="cx"> unsigned line;
</span><span class="cx"> unsigned column;
</span><span class="cx"> computeLineAndColumn(line, column);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeStackFrameh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/StackFrame.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/StackFrame.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/runtime/StackFrame.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -32,18 +32,39 @@
</span><span class="cx"> class CodeBlock;
</span><span class="cx"> class JSObject;
</span><span class="cx">
</span><del>-struct StackFrame {
- Strong<JSObject> callee;
- Strong<CodeBlock> codeBlock;
- unsigned bytecodeOffset;
</del><ins>+class StackFrame {
+public:
+ StackFrame(VM& vm, JSCell* callee)
+ : m_callee(vm, callee)
+ { }
+
+ StackFrame(VM& vm, JSCell* callee, CodeBlock* codeBlock, unsigned bytecodeOffset)
+ : m_callee(vm, callee)
+ , m_codeBlock(vm, codeBlock)
+ , m_bytecodeOffset(bytecodeOffset)
+ { }
+
+ bool hasLineAndColumnInfo() const { return !!m_codeBlock; }
</ins><span class="cx">
</span><del>- bool isNative() const { return !codeBlock; }
-
</del><span class="cx"> void computeLineAndColumn(unsigned& line, unsigned& column) const;
</span><span class="cx"> String functionName(VM&) const;
</span><span class="cx"> intptr_t sourceID() const;
</span><span class="cx"> String sourceURL() const;
</span><span class="cx"> String toString(VM&) const;
</span><ins>+
+ bool hasBytecodeOffset() const { return m_bytecodeOffset != UINT_MAX; }
+ unsigned bytecodeOffset()
+ {
+ ASSERT(m_bytecodeOffset != UINT_MAX);
+ return m_bytecodeOffset;
+ }
+
+
+private:
+ Strong<JSCell> m_callee { };
+ Strong<CodeBlock> m_codeBlock { };
+ unsigned m_bytecodeOffset { UINT_MAX };
+
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeVMh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/VM.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/VM.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/runtime/VM.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> class ScriptExecutable;
</span><span class="cx"> class SourceProvider;
</span><span class="cx"> class SourceProviderCache;
</span><del>-struct StackFrame;
</del><ins>+class StackFrame;
</ins><span class="cx"> class Structure;
</span><span class="cx"> #if ENABLE(REGEXP_TRACING)
</span><span class="cx"> class RegExp;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmB3IRGeneratorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/WasmB3IRGenerator.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -40,8 +40,13 @@
</span><span class="cx"> #include "B3VariableValue.h"
</span><span class="cx"> #include "B3WasmAddressValue.h"
</span><span class="cx"> #include "B3WasmBoundsCheckValue.h"
</span><ins>+#include "ExceptionScope.h"
+#include "FrameTracers.h"
+#include "JITExceptions.h"
+#include "JSCInlines.h"
</ins><span class="cx"> #include "JSWebAssemblyInstance.h"
</span><span class="cx"> #include "JSWebAssemblyModule.h"
</span><ins>+#include "JSWebAssemblyRuntimeError.h"
</ins><span class="cx"> #include "VirtualRegister.h"
</span><span class="cx"> #include "WasmCallingConvention.h"
</span><span class="cx"> #include "WasmFunctionParser.h"
</span><span class="lines">@@ -224,13 +229,45 @@
</span><span class="cx"> m_proc.pinRegister(info.sizeRegister);
</span><span class="cx">
</span><span class="cx"> m_proc.setWasmBoundsCheckGenerator([=] (CCallHelpers& jit, GPRReg pinnedGPR, unsigned) {
</span><ins>+ AllowMacroScratchRegisterUsage allowScratch(jit);
</ins><span class="cx"> ASSERT_UNUSED(pinnedGPR, m_memorySizeGPR == pinnedGPR);
</span><del>- // FIXME: This should unwind the stack and throw a JS exception. See: https://bugs.webkit.org/show_bug.cgi?id=163351
- jit.breakpoint();
</del><ins>+ jit.copyCalleeSavesToVMEntryFrameCalleeSavesBuffer();
+
+ jit.move(GPRInfo::callFrameRegister, GPRInfo::argumentGPR0);
+
+ CCallHelpers::Call call = jit.call();
+ jit.jumpToExceptionHandler();
+
+ jit.addLinkTask([=] (LinkBuffer& linkBuffer) {
+ void (*throwMemoryException)(ExecState*) = [] (ExecState* exec) {
+ VM* vm = &exec->vm();
+ NativeCallFrameTracer tracer(vm, exec);
+
+ {
+ auto throwScope = DECLARE_THROW_SCOPE(*vm);
+ JSGlobalObject* globalObject = vm->topJSWebAssemblyInstance->globalObject();
+
+ JSWebAssemblyRuntimeError* error = JSWebAssemblyRuntimeError::create(
+ exec, globalObject->WebAssemblyRuntimeErrorStructure(), "Out of bounds memory access");
+ throwException(exec, throwScope, error);
+ }
+
+ genericUnwind(vm, exec);
+ ASSERT(!!vm->callFrameForCatch);
+ };
+
+ linkBuffer.link(call, throwMemoryException);
+ });
</ins><span class="cx"> });
</span><ins>+
+ B3::PatchpointValue* foo = m_currentBlock->appendNew<B3::PatchpointValue>(m_proc, B3::Void, Origin());
+ foo->setGenerator(
+ [=] (CCallHelpers& jit, const B3::StackmapGenerationParams&) {
+ AllowMacroScratchRegisterUsage allowScratch(jit);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- wasmCallingConvention().setupFrameInPrologue(compilation, m_proc, Origin(), m_currentBlock);
</del><ins>+ wasmCallingConvention().setupFrameInPrologue(&compilation->wasmCalleeMoveLocation, m_proc, Origin(), m_currentBlock);
</ins><span class="cx">
</span><span class="cx"> m_functionIndexSpaceValue = m_currentBlock->appendNew<ConstPtrValue>(m_proc, Origin(), functionIndexSpace.buffer.get());
</span><span class="cx"> }
</span><span class="lines">@@ -718,21 +755,25 @@
</span><span class="cx"> dataLogLn("\n");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static std::unique_ptr<Compilation> createJSToWasmWrapper(VM& vm, const Signature* signature, MacroAssemblerCodePtr mainFunction, const MemoryInformation& memory)
</del><ins>+static std::unique_ptr<Compilation> createJSToWasmWrapper(VM& vm, WasmInternalFunction& function, const Signature* signature, MacroAssemblerCodePtr mainFunction, const MemoryInformation& memory)
</ins><span class="cx"> {
</span><span class="cx"> Procedure proc;
</span><span class="cx"> BasicBlock* block = proc.addBlock();
</span><span class="cx">
</span><del>- // Check argument count is sane.
- Value* framePointer = block->appendNew<B3::Value>(proc, B3::FramePointer, Origin());
- Value* offSetOfArgumentCount = block->appendNew<Const64Value>(proc, Origin(), CallFrameSlot::argumentCount * sizeof(Register));
- Value* argumentCount = block->appendNew<MemoryValue>(proc, Load, Int32, Origin(),
- block->appendNew<Value>(proc, Add, Origin(), framePointer, offSetOfArgumentCount));
</del><ins>+ Origin origin;
</ins><span class="cx">
</span><del>- Value* expectedArgumentCount = block->appendNew<Const32Value>(proc, Origin(), signature->arguments.size());
</del><ins>+ jscCallingConvention().setupFrameInPrologue(&function.jsToWasmCalleeMoveLocation, proc, origin, block);
</ins><span class="cx">
</span><del>- CheckValue* argumentCountCheck = block->appendNew<CheckValue>(proc, Check, Origin(),
- block->appendNew<Value>(proc, Above, Origin(), expectedArgumentCount, argumentCount));
</del><ins>+ Value* framePointer = block->appendNew<B3::Value>(proc, B3::FramePointer, origin);
+ Value* offSetOfArgumentCount = block->appendNew<Const64Value>(proc, origin, CallFrameSlot::argumentCount * sizeof(Register));
+ Value* argumentCount = block->appendNew<MemoryValue>(proc, Load, Int32, origin,
+ block->appendNew<Value>(proc, Add, origin, framePointer, offSetOfArgumentCount));
+
+ Value* expectedArgumentCount = block->appendNew<Const32Value>(proc, origin, signature->arguments.size());
+
+ CheckValue* argumentCountCheck = block->appendNew<CheckValue>(proc, Check, origin,
+ block->appendNew<Value>(proc, Above, origin, expectedArgumentCount, argumentCount));
+
</ins><span class="cx"> argumentCountCheck->setGenerator([] (CCallHelpers& jit, const StackmapGenerationParams&) {
</span><span class="cx"> jit.breakpoint();
</span><span class="cx"> });
</span><span class="lines">@@ -747,19 +788,19 @@
</span><span class="cx"> block->appendNew<ConstPtrValue>(proc, Origin(), &vm.topWasmMemorySize));
</span><span class="cx"> sizes.reserveCapacity(memory.pinnedRegisters().sizeRegisters.size());
</span><span class="cx"> for (auto info : memory.pinnedRegisters().sizeRegisters) {
</span><del>- sizes.append(block->appendNew<Value>(proc, Sub, Origin(), size,
- block->appendNew<Const32Value>(proc, Origin(), info.sizeOffset)));
</del><ins>+ sizes.append(block->appendNew<Value>(proc, Sub, origin, size,
+ block->appendNew<Const32Value>(proc, origin, info.sizeOffset)));
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Get our arguments.
</span><span class="cx"> Vector<Value*> arguments;
</span><del>- jscCallingConvention().loadArguments(signature->arguments, proc, block, Origin(), [&] (Value* argument, unsigned) {
</del><ins>+ jscCallingConvention().loadArguments(signature->arguments, proc, block, origin, [&] (Value* argument, unsigned) {
</ins><span class="cx"> arguments.append(argument);
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> // Move the arguments into place.
</span><del>- Value* result = wasmCallingConvention().setupCall(proc, block, Origin(), arguments, toB3Type(signature->returnType), [&] (PatchpointValue* patchpoint) {
</del><ins>+ Value* result = wasmCallingConvention().setupCall(proc, block, origin, arguments, toB3Type(signature->returnType), [&] (PatchpointValue* patchpoint) {
</ins><span class="cx"> if (!!memory) {
</span><span class="cx"> ASSERT(sizes.size() == memory.pinnedRegisters().sizeRegisters.size());
</span><span class="cx"> patchpoint->append(ConstrainedValue(baseMemory, ValueRep::reg(memory.pinnedRegisters().baseMemoryPointer)));
</span><span class="lines">@@ -780,15 +821,15 @@
</span><span class="cx"> // Return the result, if needed.
</span><span class="cx"> switch (signature->returnType) {
</span><span class="cx"> case Wasm::Void:
</span><del>- block->appendNewControlValue(proc, B3::Return, Origin());
</del><ins>+ block->appendNewControlValue(proc, B3::Return, origin);
</ins><span class="cx"> break;
</span><span class="cx"> case Wasm::F32:
</span><span class="cx"> case Wasm::F64:
</span><del>- result = block->appendNew<Value>(proc, BitwiseCast, Origin(), result);
</del><ins>+ result = block->appendNew<Value>(proc, BitwiseCast, origin, result);
</ins><span class="cx"> FALLTHROUGH;
</span><span class="cx"> case Wasm::I32:
</span><span class="cx"> case Wasm::I64:
</span><del>- block->appendNewControlValue(proc, B3::Return, Origin(), result);
</del><ins>+ block->appendNewControlValue(proc, B3::Return, origin, result);
</ins><span class="cx"> break;
</span><span class="cx"> case Wasm::Func:
</span><span class="cx"> case Wasm::Anyfunc:
</span><span class="lines">@@ -795,7 +836,9 @@
</span><span class="cx"> RELEASE_ASSERT_NOT_REACHED();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- return std::make_unique<Compilation>(vm, proc);
</del><ins>+ auto jsEntrypoint = std::make_unique<Compilation>(vm, proc);
+ function.jsToWasmEntrypoint.calleeSaveRegisters = proc.calleeSaveRegisters();
+ return jsEntrypoint;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<WasmInternalFunction> parseAndCompile(VM& vm, const uint8_t* functionStart, size_t functionLength, const Signature* signature, Vector<UnlinkedWasmToWasmCall>& unlinkedWasmToWasmCalls, const ImmutableFunctionIndexSpace& functionIndexSpace, const ModuleInformation& info, unsigned optLevel)
</span><span class="lines">@@ -817,8 +860,9 @@
</span><span class="cx"> if (verbose)
</span><span class="cx"> dataLog("Post SSA: ", procedure);
</span><span class="cx">
</span><del>- result->code = std::make_unique<Compilation>(vm, procedure, optLevel);
- result->jsToWasmEntryPoint = createJSToWasmWrapper(vm, signature, result->code->code(), info.memory);
</del><ins>+ result->wasmEntrypoint.compilation = std::make_unique<Compilation>(vm, procedure, optLevel);
+ result->wasmEntrypoint.calleeSaveRegisters = procedure.calleeSaveRegisters();
+ result->jsToWasmEntrypoint.compilation = createJSToWasmWrapper(vm, *result, signature, result->wasmEntrypoint.compilation->code(), info.memory);
</ins><span class="cx"> return result;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmCallingConventionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmCallingConvention.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmCallingConvention.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/WasmCallingConvention.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> public:
</span><del>- void setupFrameInPrologue(WasmInternalFunction* compilation, B3::Procedure& proc, B3::Origin origin, B3::BasicBlock* block) const
</del><ins>+ void setupFrameInPrologue(CodeLocationDataLabelPtr* calleeMoveLocation, B3::Procedure& proc, B3::Origin origin, B3::BasicBlock* block) const
</ins><span class="cx"> {
</span><span class="cx"> static_assert(CallFrameSlot::callee * sizeof(Register) < headerSize, "We rely on this here for now.");
</span><span class="cx"> static_assert(CallFrameSlot::codeBlock * sizeof(Register) < headerSize, "We rely on this here for now.");
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> GPRReg result = params[0].gpr();
</span><span class="cx"> MacroAssembler::DataLabelPtr moveLocation = jit.moveWithPatch(MacroAssembler::TrustedImmPtr(nullptr), result);
</span><span class="cx"> jit.addLinkTask([=] (LinkBuffer& linkBuffer) {
</span><del>- compilation->calleeMoveLocation = linkBuffer.locationOf(moveLocation);
</del><ins>+ *calleeMoveLocation = linkBuffer.locationOf(moveLocation);
</ins><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmFormath"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmFormat.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmFormat.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/WasmFormat.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -32,6 +32,7 @@
</span><span class="cx"> #include "CodeLocation.h"
</span><span class="cx"> #include "Identifier.h"
</span><span class="cx"> #include "MacroAssemblerCodeRef.h"
</span><ins>+#include "RegisterAtOffsetList.h"
</ins><span class="cx"> #include "WasmMemoryInformation.h"
</span><span class="cx"> #include "WasmOps.h"
</span><span class="cx"> #include "WasmPageCount.h"
</span><span class="lines">@@ -166,10 +167,17 @@
</span><span class="cx"> size_t functionIndex;
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+struct Entrypoint {
+ std::unique_ptr<B3::Compilation> compilation;
+ RegisterAtOffsetList calleeSaveRegisters;
+};
+
</ins><span class="cx"> struct WasmInternalFunction {
</span><del>- CodeLocationDataLabelPtr calleeMoveLocation;
- std::unique_ptr<B3::Compilation> code;
- std::unique_ptr<B3::Compilation> jsToWasmEntryPoint;
</del><ins>+ CodeLocationDataLabelPtr wasmCalleeMoveLocation;
+ CodeLocationDataLabelPtr jsToWasmCalleeMoveLocation;
+
+ Entrypoint wasmEntrypoint;
+ Entrypoint jsToWasmEntrypoint;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef MacroAssemblerCodeRef WasmToJSStub;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmMemorycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/WasmMemory.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -38,15 +38,15 @@
</span><span class="cx"> , m_maximum(maximum)
</span><span class="cx"> // FIXME: If we add signal based bounds checking then we need extra space for overflow on load.
</span><span class="cx"> // see: https://bugs.webkit.org/show_bug.cgi?id=162693
</span><del>- , m_mappedCapacity(PageCount::max().bytes())
</del><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!maximum || maximum >= initial); // This should be guaranteed by our caller.
</span><span class="cx">
</span><ins>+ m_mappedCapacity = m_capacity;
</ins><span class="cx"> // FIXME: It would be nice if we had a VM tag for wasm memory. https://bugs.webkit.org/show_bug.cgi?id=163600
</span><span class="cx"> void* result = mmap(nullptr, m_mappedCapacity, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);
</span><span class="cx"> if (result == MAP_FAILED) {
</span><span class="cx"> // Try again with a different number.
</span><del>- m_mappedCapacity = m_capacity;
</del><ins>+ m_mappedCapacity = m_size;
</ins><span class="cx"> result = mmap(nullptr, m_mappedCapacity, PROT_NONE, MAP_PRIVATE | MAP_ANON, -1, 0);
</span><span class="cx"> if (result == MAP_FAILED)
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmMemoryh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmMemory.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmMemory.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/WasmMemory.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -52,6 +52,8 @@
</span><span class="cx"> munmap(m_memory, m_mappedCapacity);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ bool isValid() const { return !!m_memory; }
+
</ins><span class="cx"> void* memory() const { return m_memory; }
</span><span class="cx"> uint32_t size() const { return m_size; }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmPlancpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/WasmPlan.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -130,7 +130,7 @@
</span><span class="cx">
</span><span class="cx"> unlinkedWasmToWasmCalls.uncheckedAppend(Vector<UnlinkedWasmToWasmCall>());
</span><span class="cx"> m_wasmInternalFunctions.uncheckedAppend(parseAndCompile(*m_vm, functionStart, functionLength, signature, unlinkedWasmToWasmCalls.at(functionIndex), m_functionIndexSpace, *m_moduleInformation));
</span><del>- m_functionIndexSpace.buffer.get()[functionIndexSpace].code = m_wasmInternalFunctions[functionIndex]->code->code().executableAddress();
</del><ins>+ m_functionIndexSpace.buffer.get()[functionIndexSpace].code = m_wasmInternalFunctions[functionIndex]->wasmEntrypoint.compilation->code().executableAddress();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Patch the call sites for each WebAssembly function.
</span><span class="lines">@@ -142,20 +142,19 @@
</span><span class="cx"> m_failed = false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Plan::initializeCallees(JSGlobalObject* globalObject, std::function<void(unsigned, JSWebAssemblyCallee*)> callback)
</del><ins>+void Plan::initializeCallees(JSGlobalObject* globalObject, std::function<void(unsigned, JSWebAssemblyCallee*, JSWebAssemblyCallee*)> callback)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!failed());
</span><span class="cx"> for (unsigned internalFunctionIndex = 0; internalFunctionIndex < m_wasmInternalFunctions.size(); ++internalFunctionIndex) {
</span><span class="cx"> WasmInternalFunction* function = m_wasmInternalFunctions[internalFunctionIndex].get();
</span><del>- CodeLocationDataLabelPtr calleeMoveLocation = function->calleeMoveLocation;
- JSWebAssemblyCallee* callee = JSWebAssemblyCallee::create(globalObject->vm(), WTFMove(function->code), WTFMove(function->jsToWasmEntryPoint));
</del><span class="cx">
</span><del>- MacroAssembler::repatchPointer(calleeMoveLocation, callee);
</del><ins>+ JSWebAssemblyCallee* jsEntrypointCallee = JSWebAssemblyCallee::create(globalObject->vm(), WTFMove(function->jsToWasmEntrypoint));
+ MacroAssembler::repatchPointer(function->jsToWasmCalleeMoveLocation, jsEntrypointCallee);
</ins><span class="cx">
</span><del>- if (verbose)
- dataLogLn("Made Wasm callee: ", RawPointer(callee));
</del><ins>+ JSWebAssemblyCallee* wasmEntrypointCallee = JSWebAssemblyCallee::create(globalObject->vm(), WTFMove(function->wasmEntrypoint));
+ MacroAssembler::repatchPointer(function->wasmCalleeMoveLocation, wasmEntrypointCallee);
</ins><span class="cx">
</span><del>- callback(internalFunctionIndex, callee);
</del><ins>+ callback(internalFunctionIndex, jsEntrypointCallee, wasmEntrypointCallee);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmPlanh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmPlan.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmPlan.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/WasmPlan.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> JS_EXPORT_PRIVATE void run();
</span><span class="cx">
</span><del>- JS_EXPORT_PRIVATE void initializeCallees(JSGlobalObject*, std::function<void(unsigned, JSWebAssemblyCallee*)>);
</del><ins>+ JS_EXPORT_PRIVATE void initializeCallees(JSGlobalObject*, std::function<void(unsigned, JSWebAssemblyCallee*, JSWebAssemblyCallee*)>);
</ins><span class="cx">
</span><span class="cx"> bool WARN_UNUSED_RETURN failed() const { return m_failed; }
</span><span class="cx"> const String& errorMessage() const
</span><span class="lines">@@ -71,12 +71,6 @@
</span><span class="cx"> return m_wasmInternalFunctions.size();
</span><span class="cx"> }
</span><span class="cx">
</span><del>- B3::Compilation* jsToWasmEntryPointForFunction(size_t i) const
- {
- ASSERT(i > m_wasmToJSStubs.size());
- return m_wasmInternalFunctions.at(i - m_wasmToJSStubs.size())->jsToWasmEntryPoint.get();
- }
-
</del><span class="cx"> std::unique_ptr<ModuleInformation>&& takeModuleInformation()
</span><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(!failed());
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyCalleecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -38,12 +38,11 @@
</span><span class="cx"> : Base(vm, vm.webAssemblyCalleeStructure.get())
</span><span class="cx"> { }
</span><span class="cx">
</span><del>-void JSWebAssemblyCallee::finishCreation(VM& vm, std::unique_ptr<B3::Compilation>&& code, std::unique_ptr<B3::Compilation>&& jsToWasmEntryPoint)
</del><ins>+void JSWebAssemblyCallee::finishCreation(VM& vm, Wasm::Entrypoint&& entrypoint)
</ins><span class="cx"> {
</span><span class="cx"> Base::finishCreation(vm);
</span><span class="cx">
</span><del>- m_code = WTFMove(code);
- m_jsToWasmEntryPoint = WTFMove(jsToWasmEntryPoint);
</del><ins>+ m_entrypoint = WTFMove(entrypoint);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSWebAssemblyCallee::destroy(JSCell* cell)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyCalleeh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCallee.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -27,7 +27,9 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><del>-#include "JSCallee.h"
</del><ins>+#include "JSCell.h"
+#include "RegisterAtOffsetList.h"
+#include "Structure.h"
</ins><span class="cx"> #include "WasmFormat.h"
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="lines">@@ -37,10 +39,10 @@
</span><span class="cx"> typedef JSCell Base;
</span><span class="cx"> static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
</span><span class="cx">
</span><del>- static JSWebAssemblyCallee* create(VM& vm, std::unique_ptr<B3::Compilation>&& code, std::unique_ptr<B3::Compilation>&& jsToWasmEntryPoint)
</del><ins>+ static JSWebAssemblyCallee* create(VM& vm, Wasm::Entrypoint&& entrypoint)
</ins><span class="cx"> {
</span><span class="cx"> JSWebAssemblyCallee* callee = new (NotNull, allocateCell<JSWebAssemblyCallee>(vm.heap)) JSWebAssemblyCallee(vm);
</span><del>- callee->finishCreation(vm, std::forward<std::unique_ptr<B3::Compilation>>(code), std::forward<std::unique_ptr<B3::Compilation>>(jsToWasmEntryPoint));
</del><ins>+ callee->finishCreation(vm, WTFMove(entrypoint));
</ins><span class="cx"> return callee;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -53,14 +55,15 @@
</span><span class="cx"> static const bool needsDestruction = true;
</span><span class="cx"> static void destroy(JSCell*);
</span><span class="cx">
</span><del>- void* jsToWasmEntryPoint() { return m_jsToWasmEntryPoint->code().executableAddress(); }
</del><ins>+ void* entrypoint() { return m_entrypoint.compilation->code().executableAddress(); }
</ins><span class="cx">
</span><ins>+ RegisterAtOffsetList* calleeSaveRegisters() { return &m_entrypoint.calleeSaveRegisters; }
+
</ins><span class="cx"> private:
</span><del>- void finishCreation(VM&, std::unique_ptr<B3::Compilation>&&, std::unique_ptr<B3::Compilation>&&);
</del><ins>+ void finishCreation(VM&, Wasm::Entrypoint&&);
</ins><span class="cx"> JSWebAssemblyCallee(VM&);
</span><span class="cx">
</span><del>- std::unique_ptr<B3::Compilation> m_code;
- std::unique_ptr<B3::Compilation> m_jsToWasmEntryPoint;
</del><ins>+ Wasm::Entrypoint m_entrypoint;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyModulecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -58,7 +58,7 @@
</span><span class="cx"> , m_functionIndexSpace(WTFMove(functionIndexSpace))
</span><span class="cx"> , m_calleeCount(calleeCount)
</span><span class="cx"> {
</span><del>- memset(callees(), 0, m_calleeCount * sizeof(WriteBarrier<JSWebAssemblyCallee>));
</del><ins>+ memset(callees(), 0, m_calleeCount * sizeof(WriteBarrier<JSWebAssemblyCallee>) * 2);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void JSWebAssemblyModule::finishCreation(VM& vm, SymbolTable* exportSymbolTable)
</span><span class="lines">@@ -75,19 +75,27 @@
</span><span class="cx">
</span><span class="cx"> void JSWebAssemblyModule::visitChildren(JSCell* cell, SlotVisitor& visitor)
</span><span class="cx"> {
</span><del>- auto* thisObject = jsCast<JSWebAssemblyModule*>(cell);
</del><ins>+ JSWebAssemblyModule* thisObject = jsCast<JSWebAssemblyModule*>(cell);
</ins><span class="cx"> ASSERT_GC_OBJECT_INHERITS(thisObject, info());
</span><span class="cx">
</span><span class="cx"> Base::visitChildren(thisObject, visitor);
</span><span class="cx"> visitor.append(&thisObject->m_exportSymbolTable);
</span><del>- for (auto iter = thisObject->m_callLinkInfos.begin(); !!iter; ++iter)
- (*iter)->visitWeak(*thisObject->vm());
- for (unsigned i = 0; i < thisObject->m_calleeCount; i++) {
</del><ins>+ for (unsigned i = 0; i < thisObject->m_calleeCount * 2; i++) {
</ins><span class="cx"> WriteBarrier<JSWebAssemblyCallee>* callee = &thisObject->callees()[i];
</span><span class="cx"> visitor.append(callee);
</span><span class="cx"> }
</span><ins>+
+ visitor.addUnconditionalFinalizer(&thisObject->m_unconditionalFinalizer);
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+void JSWebAssemblyModule::UnconditionalFinalizer::finalizeUnconditionally()
+{
+ JSWebAssemblyModule* thisObject = bitwise_cast<JSWebAssemblyModule*>(
+ bitwise_cast<char*>(this) - OBJECT_OFFSETOF(JSWebAssemblyModule, m_unconditionalFinalizer));
+ for (auto iter = thisObject->m_callLinkInfos.begin(); !!iter; ++iter)
+ (*iter)->visitWeak(*thisObject->vm());
+}
+
</ins><span class="cx"> } // namespace JSC
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(WEBASSEMBLY)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyModuleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyModule.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx">
</span><span class="cx"> #include "JSDestructibleObject.h"
</span><span class="cx"> #include "JSObject.h"
</span><ins>+#include "JSWebAssemblyCallee.h"
+#include "UnconditionalFinalizer.h"
</ins><span class="cx"> #include "WasmFormat.h"
</span><span class="cx"> #include <wtf/Bag.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="lines">@@ -35,7 +37,6 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-class JSWebAssemblyCallee;
</del><span class="cx"> class SymbolTable;
</span><span class="cx">
</span><span class="cx"> class JSWebAssemblyModule : public JSDestructibleObject {
</span><span class="lines">@@ -52,7 +53,7 @@
</span><span class="cx"> Wasm::Signature* signatureForFunctionIndexSpace(unsigned functionIndexSpace) const { ASSERT(functionIndexSpace < m_functionIndexSpace.size); return m_functionIndexSpace.buffer.get()[functionIndexSpace].signature; }
</span><span class="cx"> unsigned importCount() const { return m_wasmToJSStubs.size(); }
</span><span class="cx">
</span><del>- JSWebAssemblyCallee* calleeFromFunctionIndexSpace(unsigned functionIndexSpace)
</del><ins>+ JSWebAssemblyCallee* jsEntrypointCalleeFromFunctionIndexSpace(unsigned functionIndexSpace)
</ins><span class="cx"> {
</span><span class="cx"> RELEASE_ASSERT(functionIndexSpace >= importCount());
</span><span class="cx"> unsigned calleeIndex = functionIndexSpace - importCount();
</span><span class="lines">@@ -60,6 +61,26 @@
</span><span class="cx"> return callees()[calleeIndex].get();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ JSWebAssemblyCallee* wasmEntrypointCalleeFromFunctionIndexSpace(unsigned functionIndexSpace)
+ {
+ RELEASE_ASSERT(functionIndexSpace >= importCount());
+ unsigned calleeIndex = functionIndexSpace - importCount();
+ RELEASE_ASSERT(calleeIndex < m_calleeCount);
+ return callees()[calleeIndex + m_calleeCount].get();
+ }
+
+ void setJSEntrypointCallee(VM& vm, unsigned calleeIndex, JSWebAssemblyCallee* callee)
+ {
+ RELEASE_ASSERT(calleeIndex < m_calleeCount);
+ callees()[calleeIndex].set(vm, this, callee);
+ }
+
+ void setWasmEntrypointCallee(VM& vm, unsigned calleeIndex, JSWebAssemblyCallee* callee)
+ {
+ RELEASE_ASSERT(calleeIndex < m_calleeCount);
+ callees()[calleeIndex + m_calleeCount].set(vm, this, callee);
+ }
+
</ins><span class="cx"> WriteBarrier<JSWebAssemblyCallee>* callees()
</span><span class="cx"> {
</span><span class="cx"> return bitwise_cast<WriteBarrier<JSWebAssemblyCallee>*>(bitwise_cast<char*>(this) + offsetOfCallees());
</span><span class="lines">@@ -81,9 +102,14 @@
</span><span class="cx">
</span><span class="cx"> static size_t allocationSize(unsigned numCallees)
</span><span class="cx"> {
</span><del>- return offsetOfCallees() + sizeof(WriteBarrier<JSWebAssemblyCallee>) * numCallees;
</del><ins>+ return offsetOfCallees() + sizeof(WriteBarrier<JSWebAssemblyCallee>) * numCallees * 2;
</ins><span class="cx"> }
</span><span class="cx">
</span><ins>+ class UnconditionalFinalizer : public JSC::UnconditionalFinalizer {
+ void finalizeUnconditionally() override;
+ };
+
+ UnconditionalFinalizer m_unconditionalFinalizer;
</ins><span class="cx"> std::unique_ptr<Wasm::ModuleInformation> m_moduleInformation;
</span><span class="cx"> Bag<CallLinkInfo> m_callLinkInfos;
</span><span class="cx"> WriteBarrier<SymbolTable> m_exportSymbolTable;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyRuntimeErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -35,7 +35,7 @@
</span><span class="cx"> public:
</span><span class="cx"> typedef ErrorInstance Base;
</span><span class="cx">
</span><del>- static JSWebAssemblyRuntimeError* create(ExecState*, Structure*, const String&, bool);
</del><ins>+ static JSWebAssemblyRuntimeError* create(ExecState*, Structure*, const String&, bool useCurrentFrame = true);
</ins><span class="cx"> static JSWebAssemblyRuntimeError* create(ExecState* exec, Structure* structure, JSValue message, bool useCurrentFrame)
</span><span class="cx"> {
</span><span class="cx"> return create(exec, structure, message.isUndefined() ? String() : message.toString(exec)->value(exec), useCurrentFrame);
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyFunctioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyFunction.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -116,7 +116,8 @@
</span><span class="cx">
</span><span class="cx"> JSWebAssemblyInstance* prevJSWebAssemblyInstance = vm.topJSWebAssemblyInstance;
</span><span class="cx"> vm.topJSWebAssemblyInstance = instance();
</span><del>- EncodedJSValue rawResult = vmEntryToWasm(webAssemblyCallee()->jsToWasmEntryPoint(), &vm, protoCallFrame);
</del><ins>+ ASSERT(instance());
+ EncodedJSValue rawResult = vmEntryToWasm(webAssemblyCallee()->entrypoint(), &vm, protoCallFrame);
</ins><span class="cx"> vm.topJSWebAssemblyInstance = prevJSWebAssemblyInstance;
</span><span class="cx">
</span><span class="cx"> // FIXME is this correct? https://bugs.webkit.org/show_bug.cgi?id=164876
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyInstanceConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -193,6 +193,8 @@
</span><span class="cx"> RELEASE_ASSERT(!moduleInformation.memory.isImport());
</span><span class="cx"> // We create a memory when it's a memory definition.
</span><span class="cx"> std::unique_ptr<Wasm::Memory> memory = std::make_unique<Wasm::Memory>(moduleInformation.memory.initial(), moduleInformation.memory.maximum());
</span><ins>+ if (!memory->isValid())
+ return JSValue::encode(throwException(exec, throwScope, createOutOfMemoryError(exec)));
</ins><span class="cx"> instance->setMemory(vm,
</span><span class="cx"> JSWebAssemblyMemory::create(vm, exec->lexicalGlobalObject()->WebAssemblyMemoryStructure(), WTFMove(memory)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyMemoryConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -107,6 +107,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<Wasm::Memory> memory = std::make_unique<Wasm::Memory>(initialPageCount, maximumPageCount);
</span><ins>+ if (!memory->isValid())
+ return JSValue::encode(throwException(exec, throwScope, createOutOfMemoryError(exec)));
</ins><span class="cx">
</span><span class="cx"> return JSValue::encode(JSWebAssemblyMemory::create(vm, exec->lexicalGlobalObject()->WebAssemblyMemoryStructure(), WTFMove(memory)));
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyModuleConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -92,8 +92,9 @@
</span><span class="cx"> unsigned calleeCount = plan.internalFunctionCount();
</span><span class="cx"> JSWebAssemblyModule* result = JSWebAssemblyModule::create(vm, structure, plan.takeModuleInformation(), plan.takeCallLinkInfos(), plan.takeWasmToJSStubs(), plan.takeFunctionIndexSpace(), exportSymbolTable, calleeCount);
</span><span class="cx"> plan.initializeCallees(state->jsCallee()->globalObject(),
</span><del>- [&] (unsigned calleeIndex, JSWebAssemblyCallee* callee) {
- result->callees()[calleeIndex].set(vm, result, callee);
</del><ins>+ [&] (unsigned calleeIndex, JSWebAssemblyCallee* jsEntrypointCallee, JSWebAssemblyCallee* wasmEntrypointCallee) {
+ result->setJSEntrypointCallee(vm, calleeIndex, jsEntrypointCallee);
+ result->setWasmEntrypointCallee(vm, calleeIndex, wasmEntrypointCallee);
</ins><span class="cx"> });
</span><span class="cx"> return JSValue::encode(result);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyModuleRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> // a. Let func be an Exported Function Exotic Object created from c.
</span><span class="cx"> // b. Append func to funcs.
</span><span class="cx"> // c. Return func.
</span><del>- JSWebAssemblyCallee* wasmCallee = module->calleeFromFunctionIndexSpace(exp.functionIndex);
</del><ins>+ JSWebAssemblyCallee* wasmCallee = module->jsEntrypointCalleeFromFunctionIndexSpace(exp.functionIndex);
</ins><span class="cx"> Wasm::Signature* signature = module->signatureForFunctionIndexSpace(exp.functionIndex);
</span><span class="cx"> WebAssemblyFunction* function = WebAssemblyFunction::create(vm, globalObject, signature->arguments.size(), exp.field.string(), instance, wasmCallee, signature);
</span><span class="cx"> exportedValue = function;
</span><span class="lines">@@ -174,7 +174,7 @@
</span><span class="cx"> // FIXME can start call imports / tables? This assumes not. https://github.com/WebAssembly/design/issues/896
</span><span class="cx"> if (!m_startFunction.get()) {
</span><span class="cx"> // The start function wasn't added above. It must be a purely internal function.
</span><del>- JSWebAssemblyCallee* wasmCallee = module->calleeFromFunctionIndexSpace(startFunctionIndexSpace);
</del><ins>+ JSWebAssemblyCallee* wasmCallee = module->jsEntrypointCalleeFromFunctionIndexSpace(startFunctionIndexSpace);
</ins><span class="cx"> WebAssemblyFunction* function = WebAssemblyFunction::create(vm, globalObject, signature->arguments.size(), "start", instance, wasmCallee, signature);
</span><span class="cx"> m_startFunction.set(vm, this, function);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/WebCore/ChangeLog 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-12-11 Saam Barati <sbarati@apple.com>
+
+ We should be able to throw exceptions from Wasm code and when Wasm frames are on the stack
+ https://bugs.webkit.org/show_bug.cgi?id=165429
+
+ Reviewed by Keith Miller.
+
+ * bindings/js/JSDOMBinding.cpp:
+ (WebCore::GetCallerGlobalObjectFunctor::operator()):
+
</ins><span class="cx"> 2016-12-11 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove uses of Dictionary in WebRTC IDL files
</span></span></pre></div>
<a id="trunkSourceWebCorebindingsjsJSDOMBindingcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp (209695 => 209696)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-12-12 02:50:06 UTC (rev 209695)
+++ trunk/Source/WebCore/bindings/js/JSDOMBinding.cpp 2016-12-12 03:11:18 UTC (rev 209696)
</span><span class="lines">@@ -759,7 +759,11 @@
</span><span class="cx"> m_globalObject = codeBlock->globalObject();
</span><span class="cx"> else {
</span><span class="cx"> ASSERT(visitor->callee());
</span><del>- m_globalObject = visitor->callee()->globalObject();
</del><ins>+ // FIXME: Callee is not an object if the caller is Web Assembly.
+ // Figure out what to do here. We can probably get the global object
+ // from the top-most Wasm Instance. https://bugs.webkit.org/show_bug.cgi?id=165721
+ if (visitor->callee()->isObject())
+ m_globalObject = jsCast<JSObject*>(visitor->callee())->globalObject();
</ins><span class="cx"> }
</span><span class="cx"> return StackVisitor::Done;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>