<!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>[214261] trunk/Source/JavaScriptCore</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/214261">214261</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2017-03-22 10:56:29 -0700 (Wed, 22 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: name ExecState consistently
https://bugs.webkit.org/show_bug.cgi?id=169954
Reviewed by Saam Barati.
No functional change.
* wasm/js/JSWebAssemblyCompileError.cpp:
(JSC::JSWebAssemblyCompileError::create):
(JSC::createJSWebAssemblyCompileError):
* wasm/js/JSWebAssemblyCompileError.h:
(JSC::JSWebAssemblyCompileError::create):
* wasm/js/JSWebAssemblyLinkError.cpp:
(JSC::JSWebAssemblyLinkError::create):
(JSC::createJSWebAssemblyLinkError):
* wasm/js/JSWebAssemblyLinkError.h:
(JSC::JSWebAssemblyLinkError::create):
* wasm/js/JSWebAssemblyRuntimeError.cpp:
(JSC::JSWebAssemblyRuntimeError::create):
* wasm/js/JSWebAssemblyRuntimeError.h:
(JSC::JSWebAssemblyRuntimeError::create):
* wasm/js/WebAssemblyInstanceConstructor.cpp:
(JSC::callJSWebAssemblyInstance):
* wasm/js/WebAssemblyMemoryConstructor.cpp:
(JSC::callJSWebAssemblyMemory):
* wasm/js/WebAssemblyModuleConstructor.cpp:
(JSC::callJSWebAssemblyModule):
(JSC::WebAssemblyModuleConstructor::createModule):
* wasm/js/WebAssemblyModuleRecord.cpp:
(JSC::WebAssemblyModuleRecord::link):
(JSC::dataSegmentFail):
(JSC::WebAssemblyModuleRecord::evaluate):
* wasm/js/WebAssemblyPrototype.cpp:
(JSC::webAssemblyFunctionValidate):
(JSC::webAssemblyFunctionCompile):
* wasm/js/WebAssemblyTableConstructor.cpp:
(JSC::callJSWebAssemblyTable):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyCompileErrorcpp">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyCompileErrorh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyLinkErrorcpp">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyLinkErrorh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyRuntimeErrorcpp">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsJSWebAssemblyRuntimeErrorh">trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h</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="#trunkSourceJavaScriptCorewasmjsWebAssemblyPrototypecpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmjsWebAssemblyTableConstructorcpp">trunk/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/ChangeLog 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -1,5 +1,45 @@
</span><span class="cx"> 2017-03-22 JF Bastien <jfbastien@apple.com>
</span><span class="cx">
</span><ins>+ WebAssembly: name ExecState consistently
+ https://bugs.webkit.org/show_bug.cgi?id=169954
+
+ Reviewed by Saam Barati.
+
+ No functional change.
+
+ * wasm/js/JSWebAssemblyCompileError.cpp:
+ (JSC::JSWebAssemblyCompileError::create):
+ (JSC::createJSWebAssemblyCompileError):
+ * wasm/js/JSWebAssemblyCompileError.h:
+ (JSC::JSWebAssemblyCompileError::create):
+ * wasm/js/JSWebAssemblyLinkError.cpp:
+ (JSC::JSWebAssemblyLinkError::create):
+ (JSC::createJSWebAssemblyLinkError):
+ * wasm/js/JSWebAssemblyLinkError.h:
+ (JSC::JSWebAssemblyLinkError::create):
+ * wasm/js/JSWebAssemblyRuntimeError.cpp:
+ (JSC::JSWebAssemblyRuntimeError::create):
+ * wasm/js/JSWebAssemblyRuntimeError.h:
+ (JSC::JSWebAssemblyRuntimeError::create):
+ * wasm/js/WebAssemblyInstanceConstructor.cpp:
+ (JSC::callJSWebAssemblyInstance):
+ * wasm/js/WebAssemblyMemoryConstructor.cpp:
+ (JSC::callJSWebAssemblyMemory):
+ * wasm/js/WebAssemblyModuleConstructor.cpp:
+ (JSC::callJSWebAssemblyModule):
+ (JSC::WebAssemblyModuleConstructor::createModule):
+ * wasm/js/WebAssemblyModuleRecord.cpp:
+ (JSC::WebAssemblyModuleRecord::link):
+ (JSC::dataSegmentFail):
+ (JSC::WebAssemblyModuleRecord::evaluate):
+ * wasm/js/WebAssemblyPrototype.cpp:
+ (JSC::webAssemblyFunctionValidate):
+ (JSC::webAssemblyFunctionCompile):
+ * wasm/js/WebAssemblyTableConstructor.cpp:
+ (JSC::callJSWebAssemblyTable):
+
+2017-03-22 JF Bastien <jfbastien@apple.com>
+
</ins><span class="cx"> WebAssembly: constructors without new don't throw
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=165995
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyCompileErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-JSWebAssemblyCompileError* JSWebAssemblyCompileError::create(ExecState* state, VM& vm, Structure* structure, const String& message)
</del><ins>+JSWebAssemblyCompileError* JSWebAssemblyCompileError::create(ExecState* exec, VM& vm, Structure* structure, const String& message)
</ins><span class="cx"> {
</span><span class="cx"> auto* instance = new (NotNull, allocateCell<JSWebAssemblyCompileError>(vm.heap)) JSWebAssemblyCompileError(vm, structure);
</span><span class="cx"> instance->m_sourceAppender = defaultSourceAppender;
</span><span class="cx"> bool useCurrentFrame = true;
</span><del>- instance->finishCreation(state, vm, message, useCurrentFrame);
</del><ins>+ instance->finishCreation(exec, vm, message, useCurrentFrame);
</ins><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -49,11 +49,11 @@
</span><span class="cx"> const ClassInfo JSWebAssemblyCompileError::s_info = { "WebAssembly.CompileError", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWebAssemblyCompileError) };
</span><span class="cx">
</span><span class="cx">
</span><del>-JSObject* createJSWebAssemblyCompileError(ExecState* state, VM& vm, const String& message)
</del><ins>+JSObject* createJSWebAssemblyCompileError(ExecState* exec, VM& vm, const String& message)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!message.isEmpty());
</span><del>- JSGlobalObject* globalObject = state->lexicalGlobalObject();
- return JSWebAssemblyCompileError::create(state, vm, globalObject->WebAssemblyCompileErrorStructure(), message);
</del><ins>+ JSGlobalObject* globalObject = exec->lexicalGlobalObject();
+ return JSWebAssemblyCompileError::create(exec, vm, globalObject->WebAssemblyCompileErrorStructure(), message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyCompileErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.h (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.h 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyCompileError.h 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> typedef ErrorInstance Base;
</span><span class="cx">
</span><span class="cx"> static JSWebAssemblyCompileError* create(ExecState*, VM&, Structure*, const String&);
</span><del>- static JSWebAssemblyCompileError* create(ExecState* state, VM& vm, Structure* structure, JSValue message)
</del><ins>+ static JSWebAssemblyCompileError* create(ExecState* exec, VM& vm, Structure* structure, JSValue message)
</ins><span class="cx"> {
</span><del>- return create(state, vm, structure, message.isUndefined() ? String() : message.toWTFString(state));
</del><ins>+ return create(exec, vm, structure, message.isUndefined() ? String() : message.toWTFString(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyLinkErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-JSWebAssemblyLinkError* JSWebAssemblyLinkError::create(ExecState* state, VM& vm, Structure* structure, const String& message)
</del><ins>+JSWebAssemblyLinkError* JSWebAssemblyLinkError::create(ExecState* exec, VM& vm, Structure* structure, const String& message)
</ins><span class="cx"> {
</span><span class="cx"> auto* instance = new (NotNull, allocateCell<JSWebAssemblyLinkError>(vm.heap)) JSWebAssemblyLinkError(vm, structure);
</span><span class="cx"> instance->m_sourceAppender = defaultSourceAppender;
</span><span class="cx"> bool useCurrentFrame = true;
</span><del>- instance->finishCreation(state, vm, message, useCurrentFrame);
</del><ins>+ instance->finishCreation(exec, vm, message, useCurrentFrame);
</ins><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -49,11 +49,11 @@
</span><span class="cx"> const ClassInfo JSWebAssemblyLinkError::s_info = { "WebAssembly.LinkError", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWebAssemblyLinkError) };
</span><span class="cx">
</span><span class="cx">
</span><del>-JSObject* createJSWebAssemblyLinkError(ExecState* state, VM& vm, const String& message)
</del><ins>+JSObject* createJSWebAssemblyLinkError(ExecState* exec, VM& vm, const String& message)
</ins><span class="cx"> {
</span><span class="cx"> ASSERT(!message.isEmpty());
</span><del>- JSGlobalObject* globalObject = state->lexicalGlobalObject();
- return JSWebAssemblyLinkError::create(state, vm, globalObject->WebAssemblyLinkErrorStructure(), message);
</del><ins>+ JSGlobalObject* globalObject = exec->lexicalGlobalObject();
+ return JSWebAssemblyLinkError::create(exec, vm, globalObject->WebAssemblyLinkErrorStructure(), message);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace JSC
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyLinkErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.h (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.h 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyLinkError.h 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> typedef ErrorInstance Base;
</span><span class="cx">
</span><span class="cx"> static JSWebAssemblyLinkError* create(ExecState*, VM&, Structure*, const String&);
</span><del>- static JSWebAssemblyLinkError* create(ExecState* state, VM& vm, Structure* structure, JSValue message)
</del><ins>+ static JSWebAssemblyLinkError* create(ExecState* exec, VM& vm, Structure* structure, JSValue message)
</ins><span class="cx"> {
</span><del>- return create(state, vm, structure, message.isUndefined() ? String() : message.toWTFString(state));
</del><ins>+ return create(exec, vm, structure, message.isUndefined() ? String() : message.toWTFString(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyRuntimeErrorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -32,12 +32,12 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-JSWebAssemblyRuntimeError* JSWebAssemblyRuntimeError::create(ExecState* state, VM& vm, Structure* structure, const String& message)
</del><ins>+JSWebAssemblyRuntimeError* JSWebAssemblyRuntimeError::create(ExecState* exec, VM& vm, Structure* structure, const String& message)
</ins><span class="cx"> {
</span><span class="cx"> auto* instance = new (NotNull, allocateCell<JSWebAssemblyRuntimeError>(vm.heap)) JSWebAssemblyRuntimeError(vm, structure);
</span><span class="cx"> instance->m_sourceAppender = defaultSourceAppender;
</span><span class="cx"> bool useCurrentFrame = true;
</span><del>- instance->finishCreation(state, vm, message, useCurrentFrame);
</del><ins>+ instance->finishCreation(exec, vm, message, useCurrentFrame);
</ins><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsJSWebAssemblyRuntimeErrorh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/JSWebAssemblyRuntimeError.h 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -36,9 +36,9 @@
</span><span class="cx"> typedef ErrorInstance Base;
</span><span class="cx">
</span><span class="cx"> static JSWebAssemblyRuntimeError* create(ExecState*, VM&, Structure*, const String&);
</span><del>- static JSWebAssemblyRuntimeError* create(ExecState* state, VM& vm, Structure* structure, JSValue message)
</del><ins>+ static JSWebAssemblyRuntimeError* create(ExecState* exec, VM& vm, Structure* structure, JSValue message)
</ins><span class="cx"> {
</span><del>- return create(state, vm, structure, message.isUndefined() ? String() : message.toWTFString(state));
</del><ins>+ return create(exec, vm, structure, message.isUndefined() ? String() : message.toWTFString(exec));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DECLARE_INFO;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyInstanceConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyInstanceConstructor.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -319,11 +319,11 @@
</span><span class="cx"> return instance;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyInstance(ExecState* state)
</del><ins>+static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyInstance(ExecState* exec)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><del>- return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(state, scope, "WebAssembly.Instance"));
</del><ins>+ return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(exec, scope, "WebAssembly.Instance"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebAssemblyInstanceConstructor* WebAssemblyInstanceConstructor::create(VM& vm, Structure* structure, WebAssemblyInstancePrototype* thisPrototype)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyMemoryConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyMemoryConstructor.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -103,11 +103,11 @@
</span><span class="cx"> return JSValue::encode(JSWebAssemblyMemory::create(vm, exec->lexicalGlobalObject()->WebAssemblyMemoryStructure(), adoptRef(*memory.leakRef())));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyMemory(ExecState* state)
</del><ins>+static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyMemory(ExecState* exec)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto throwScope = DECLARE_THROW_SCOPE(vm);
</span><del>- return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(state, throwScope, "WebAssembly.Memory"));
</del><ins>+ return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(exec, throwScope, "WebAssembly.Memory"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebAssemblyMemoryConstructor* WebAssemblyMemoryConstructor::create(VM& vm, Structure* structure, WebAssemblyMemoryPrototype* thisPrototype)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyModuleConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleConstructor.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -63,25 +63,25 @@
</span><span class="cx"> return JSValue::encode(WebAssemblyModuleConstructor::createModule(exec, exec->argument(0), structure));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyModule(ExecState* state)
</del><ins>+static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyModule(ExecState* exec)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><del>- return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(state, scope, "WebAssembly.Module"));
</del><ins>+ return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(exec, scope, "WebAssembly.Module"));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue WebAssemblyModuleConstructor::createModule(ExecState* state, JSValue buffer, Structure* structure)
</del><ins>+JSValue WebAssemblyModuleConstructor::createModule(ExecState* exec, JSValue buffer, Structure* structure)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> size_t byteOffset;
</span><span class="cx"> size_t byteSize;
</span><del>- uint8_t* base = getWasmBufferFromValue(state, buffer, byteOffset, byteSize);
</del><ins>+ uint8_t* base = getWasmBufferFromValue(exec, buffer, byteOffset, byteSize);
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, { });
</span><span class="cx">
</span><span class="cx"> scope.release();
</span><del>- return JSWebAssemblyModule::create(vm, state, structure, base + byteOffset, byteSize);
</del><ins>+ return JSWebAssemblyModule::create(vm, exec, structure, base + byteOffset, byteSize);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebAssemblyModuleConstructor* WebAssemblyModuleConstructor::create(VM& vm, Structure* structure, WebAssemblyModulePrototype* thisPrototype)
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyModuleRecordcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyModuleRecord.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -85,12 +85,12 @@
</span><span class="cx"> visitor.append(thisObject->m_startFunction);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebAssemblyModuleRecord::link(ExecState* state, JSWebAssemblyInstance* instance)
</del><ins>+void WebAssemblyModuleRecord::link(ExecState* exec, JSWebAssemblyInstance* instance)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx"> UNUSED_PARAM(scope);
</span><del>- auto* globalObject = state->lexicalGlobalObject();
</del><ins>+ auto* globalObject = exec->lexicalGlobalObject();
</ins><span class="cx">
</span><span class="cx"> JSWebAssemblyModule* module = instance->module();
</span><span class="cx"> JSWebAssemblyCodeBlock* codeBlock = instance->codeBlock();
</span><span class="lines">@@ -158,7 +158,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case Wasm::I64:
</span><del>- throwException(state, scope, createJSWebAssemblyLinkError(state, vm, ASCIILiteral("exported global cannot be an i64")));
</del><ins>+ throwException(exec, scope, createJSWebAssemblyLinkError(exec, vm, ASCIILiteral("exported global cannot be an i64")));
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> case Wasm::F32:
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx"> bool shouldThrowReadOnlyError = false;
</span><span class="cx"> bool ignoreReadOnlyErrors = true;
</span><span class="cx"> bool putResult = false;
</span><del>- symbolTablePutTouchWatchpointSet(moduleEnvironment, state, exp.field, exportedValue, shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult);
</del><ins>+ symbolTablePutTouchWatchpointSet(moduleEnvironment, exec, exp.field, exportedValue, shouldThrowReadOnlyError, ignoreReadOnlyErrors, putResult);
</ins><span class="cx"> RELEASE_ASSERT(putResult);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -208,14 +208,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> template <typename Scope, typename M, typename N, typename ...Args>
</span><del>-NEVER_INLINE static JSValue dataSegmentFail(ExecState* state, VM& vm, Scope& scope, M memorySize, N segmentSize, N offset, Args... args)
</del><ins>+NEVER_INLINE static JSValue dataSegmentFail(ExecState* exec, VM& vm, Scope& scope, M memorySize, N segmentSize, N offset, Args... args)
</ins><span class="cx"> {
</span><del>- return throwException(state, scope, createJSWebAssemblyLinkError(state, vm, makeString(ASCIILiteral("Invalid data segment initialization: segment of "), String::number(segmentSize), ASCIILiteral(" bytes memory of "), String::number(memorySize), ASCIILiteral(" bytes, at offset "), String::number(offset), args...)));
</del><ins>+ return throwException(exec, scope, createJSWebAssemblyLinkError(exec, vm, makeString(ASCIILiteral("Invalid data segment initialization: segment of "), String::number(segmentSize), ASCIILiteral(" bytes memory of "), String::number(memorySize), ASCIILiteral(" bytes, at offset "), String::number(offset), args...)));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-JSValue WebAssemblyModuleRecord::evaluate(ExecState* state)
</del><ins>+JSValue WebAssemblyModuleRecord::evaluate(ExecState* exec)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><span class="cx">
</span><span class="cx"> {
</span><span class="lines">@@ -241,7 +241,7 @@
</span><span class="cx">
</span><span class="cx"> uint64_t lastWrittenIndex = static_cast<uint64_t>(tableIndex) + static_cast<uint64_t>(element.functionIndices.size()) - 1;
</span><span class="cx"> if (lastWrittenIndex >= table->size())
</span><del>- return throwException(state, scope, createJSWebAssemblyLinkError(state, vm, ASCIILiteral("Element is trying to set an out of bounds table index")));
</del><ins>+ return throwException(exec, scope, createJSWebAssemblyLinkError(exec, vm, ASCIILiteral("Element is trying to set an out of bounds table index")));
</ins><span class="cx">
</span><span class="cx"> for (uint32_t i = 0; i < element.functionIndices.size(); ++i) {
</span><span class="cx"> // FIXME: This essentially means we're exporting an import.
</span><span class="lines">@@ -300,9 +300,9 @@
</span><span class="cx"> offset = segment->offset.constValue();
</span><span class="cx">
</span><span class="cx"> if (UNLIKELY(sizeInBytes < segment->sizeInBytes))
</span><del>- return dataSegmentFail(state, vm, scope, sizeInBytes, segment->sizeInBytes, offset, ASCIILiteral(", segment is too big"));
</del><ins>+ return dataSegmentFail(exec, vm, scope, sizeInBytes, segment->sizeInBytes, offset, ASCIILiteral(", segment is too big"));
</ins><span class="cx"> if (UNLIKELY(offset > sizeInBytes - segment->sizeInBytes))
</span><del>- return dataSegmentFail(state, vm, scope, sizeInBytes, segment->sizeInBytes, offset, ASCIILiteral(", segment writes outside of memory"));
</del><ins>+ return dataSegmentFail(exec, vm, scope, sizeInBytes, segment->sizeInBytes, offset, ASCIILiteral(", segment writes outside of memory"));
</ins><span class="cx"> RELEASE_ASSERT(memory);
</span><span class="cx"> memcpy(memory + offset, &segment->byte(0), segment->sizeInBytes);
</span><span class="cx"> }
</span><span class="lines">@@ -313,7 +313,7 @@
</span><span class="cx"> if (JSObject* startFunction = m_startFunction.get()) {
</span><span class="cx"> CallData callData;
</span><span class="cx"> CallType callType = JSC::getCallData(startFunction, callData);
</span><del>- call(state, startFunction, callType, callData, jsUndefined(), state->emptyList());
</del><ins>+ call(exec, startFunction, callType, callData, jsUndefined(), exec->emptyList());
</ins><span class="cx"> RETURN_IF_EXCEPTION(scope, { });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyPrototypecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyPrototype.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -33,18 +33,18 @@
</span><span class="cx">
</span><span class="cx"> namespace JSC {
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL webAssemblyFunctionValidate(ExecState* state)
</del><ins>+static EncodedJSValue JSC_HOST_CALL webAssemblyFunctionValidate(ExecState* exec)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><del>- return JSValue::encode(throwException(state, scope, createError(state, ASCIILiteral("WebAssembly doesn't yet implement the validate function property"))));
</del><ins>+ return JSValue::encode(throwException(exec, scope, createError(exec, ASCIILiteral("WebAssembly doesn't yet implement the validate function property"))));
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL webAssemblyFunctionCompile(ExecState* state)
</del><ins>+static EncodedJSValue JSC_HOST_CALL webAssemblyFunctionCompile(ExecState* exec)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><del>- return JSValue::encode(throwException(state, scope, createError(state, ASCIILiteral("WebAssembly doesn't yet implement the compile function property"))));
</del><ins>+ return JSValue::encode(throwException(exec, scope, createError(exec, ASCIILiteral("WebAssembly doesn't yet implement the compile function property"))));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmjsWebAssemblyTableConstructorcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp (214260 => 214261)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp 2017-03-22 17:54:36 UTC (rev 214260)
+++ trunk/Source/JavaScriptCore/wasm/js/WebAssemblyTableConstructor.cpp 2017-03-22 17:56:29 UTC (rev 214261)
</span><span class="lines">@@ -94,11 +94,11 @@
</span><span class="cx"> return JSValue::encode(JSWebAssemblyTable::create(exec, vm, exec->lexicalGlobalObject()->WebAssemblyTableStructure(), initial, maximum));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyTable(ExecState* state)
</del><ins>+static EncodedJSValue JSC_HOST_CALL callJSWebAssemblyTable(ExecState* exec)
</ins><span class="cx"> {
</span><del>- VM& vm = state->vm();
</del><ins>+ VM& vm = exec->vm();
</ins><span class="cx"> auto scope = DECLARE_THROW_SCOPE(vm);
</span><del>- return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(state, scope, "WebAssembly.Table"));
</del><ins>+ return JSValue::encode(throwConstructorCannotBeCalledAsFunctionTypeError(exec, scope, "WebAssembly.Table"));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WebAssemblyTableConstructor* WebAssemblyTableConstructor::create(VM& vm, Structure* structure, WebAssemblyTablePrototype* thisPrototype)
</span></span></pre>
</div>
</div>
</body>
</html>