<!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>[207927] 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/207927">207927</a></dd>
<dt>Author</dt> <dd>jfbastien@apple.com</dd>
<dt>Date</dt> <dd>2016-10-26 16:57:13 -0700 (Wed, 26 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>WebAssembly: remove now-dead JSWasmModule
https://bugs.webkit.org/show_bug.cgi?id=164044
Reviewed by Keith Miller.
* CMakeLists.txt:
* JavaScriptCore.xcodeproj/project.pbxproj:
* runtime/Executable.cpp:
(JSC::WebAssemblyExecutable::WebAssemblyExecutable):
(JSC::WebAssemblyExecutable::visitChildren):
* runtime/Executable.h:
* wasm/JSWasmModule.cpp: Removed.
* wasm/JSWasmModule.h: Removed.
* wasm/WasmModuleParser.cpp:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreCMakeListstxt">trunk/Source/JavaScriptCore/CMakeLists.txt</a></li>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj">trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutablecpp">trunk/Source/JavaScriptCore/runtime/Executable.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCoreruntimeExecutableh">trunk/Source/JavaScriptCore/runtime/Executable.h</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmWasmModuleParsercpp">trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCorewasmJSWasmModulecpp">trunk/Source/JavaScriptCore/wasm/JSWasmModule.cpp</a></li>
<li><a href="#trunkSourceJavaScriptCorewasmJSWasmModuleh">trunk/Source/JavaScriptCore/wasm/JSWasmModule.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreCMakeListstxt"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/CMakeLists.txt (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/CMakeLists.txt 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/CMakeLists.txt 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -864,7 +864,6 @@
</span><span class="cx"> tools/JSDollarVM.cpp
</span><span class="cx"> tools/JSDollarVMPrototype.cpp
</span><span class="cx">
</span><del>- wasm/JSWasmModule.cpp
</del><span class="cx"> wasm/JSWebAssembly.cpp
</span><span class="cx"> wasm/WasmB3IRGenerator.cpp
</span><span class="cx"> wasm/WasmCallingConvention.cpp
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2016-10-26 JF Bastien <jfbastien@apple.com>
+
+ WebAssembly: remove now-dead JSWasmModule
+ https://bugs.webkit.org/show_bug.cgi?id=164044
+
+ Reviewed by Keith Miller.
+
+ * CMakeLists.txt:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ * runtime/Executable.cpp:
+ (JSC::WebAssemblyExecutable::WebAssemblyExecutable):
+ (JSC::WebAssemblyExecutable::visitChildren):
+ * runtime/Executable.h:
+ * wasm/JSWasmModule.cpp: Removed.
+ * wasm/JSWasmModule.h: Removed.
+ * wasm/WasmModuleParser.cpp:
+
</ins><span class="cx"> 2016-10-26 Mark Lam <mark.lam@apple.com>
</span><span class="cx">
</span><span class="cx"> JSGenericTypedArrayView::set() should check for exceptions.
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreJavaScriptCorexcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -1366,8 +1366,6 @@
</span><span class="cx"> 79EE0C001B4AFB85000385C9 /* VariableEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = 79EE0BFE1B4AFB85000385C9 /* VariableEnvironment.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 79F8FC1E1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */; };
</span><span class="cx"> 79F8FC1F1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h in Headers */ = {isa = PBXBuildFile; fileRef = 79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */; };
</span><del>- 7B98D1361B60CD5F0023B1A4 /* JSWasmModule.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */; };
- 7B98D1371B60CD620023B1A4 /* JSWasmModule.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */; settings = {ATTRIBUTES = (Private, ); }; };
</del><span class="cx"> 7BC547D31B6959A100959B58 /* WasmFormat.h in Headers */ = {isa = PBXBuildFile; fileRef = 7BC547D21B69599B00959B58 /* WasmFormat.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="cx"> 7C008CDA187124BB00955C24 /* JSPromiseDeferred.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7C008CD8187124BB00955C24 /* JSPromiseDeferred.cpp */; };
</span><span class="cx"> 7C008CDB187124BB00955C24 /* JSPromiseDeferred.h in Headers */ = {isa = PBXBuildFile; fileRef = 7C008CD9187124BB00955C24 /* JSPromiseDeferred.h */; settings = {ATTRIBUTES = (Private, ); }; };
</span><span class="lines">@@ -3714,8 +3712,6 @@
</span><span class="cx"> 79EE0BFE1B4AFB85000385C9 /* VariableEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VariableEnvironment.h; sourceTree = "<group>"; };
</span><span class="cx"> 79F8FC1C1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = DFGMaximalFlushInsertionPhase.cpp; path = dfg/DFGMaximalFlushInsertionPhase.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 79F8FC1D1B9FED0F00CA66AB /* DFGMaximalFlushInsertionPhase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DFGMaximalFlushInsertionPhase.h; path = dfg/DFGMaximalFlushInsertionPhase.h; sourceTree = "<group>"; };
</span><del>- 7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSWasmModule.cpp; sourceTree = "<group>"; };
- 7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSWasmModule.h; sourceTree = "<group>"; };
</del><span class="cx"> 7BC547D21B69599B00959B58 /* WasmFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WasmFormat.h; sourceTree = "<group>"; };
</span><span class="cx"> 7C008CD8187124BB00955C24 /* JSPromiseDeferred.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSPromiseDeferred.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 7C008CD9187124BB00955C24 /* JSPromiseDeferred.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSPromiseDeferred.h; sourceTree = "<group>"; };
</span><span class="lines">@@ -5834,8 +5830,6 @@
</span><span class="cx"> AD2FCC2E1DB839F700B3E736 /* JSWebAssembly.cpp */,
</span><span class="cx"> AD2FCC2F1DB839F700B3E736 /* JSWebAssembly.h */,
</span><span class="cx"> AD2FCB8A1DB5840000B3E736 /* js */,
</span><del>- 7B98D1341B60CD5A0023B1A4 /* JSWasmModule.cpp */,
- 7B98D1351B60CD5A0023B1A4 /* JSWasmModule.h */,
</del><span class="cx"> 53F40E8E1D5902820099A1B6 /* WasmB3IRGenerator.cpp */,
</span><span class="cx"> 53F40E921D5A4AB30099A1B6 /* WasmB3IRGenerator.h */,
</span><span class="cx"> 53FD04D11D7AB187003287D3 /* WasmCallingConvention.cpp */,
</span><span class="lines">@@ -8363,7 +8357,6 @@
</span><span class="cx"> BC18C42C0E16F5CD00B34460 /* JSValueRef.h in Headers */,
</span><span class="cx"> 86E3C615167BABD7006D760A /* JSVirtualMachine.h in Headers */,
</span><span class="cx"> 86E3C61D167BABEE006D760A /* JSVirtualMachineInternal.h in Headers */,
</span><del>- 7B98D1371B60CD620023B1A4 /* JSWasmModule.h in Headers */,
</del><span class="cx"> DC605B5E1CE26EA200593718 /* ProfilerEvent.h in Headers */,
</span><span class="cx"> A7CA3AE817DA41AE006538AF /* JSWeakMap.h in Headers */,
</span><span class="cx"> A7482E93116A7CAD003B0712 /* JSWeakObjectMapRefInternal.h in Headers */,
</span><span class="lines">@@ -9845,7 +9838,6 @@
</span><span class="cx"> 86E3C61A167BABEE006D760A /* JSValue.mm in Sources */,
</span><span class="cx"> 14BD5A320A3E91F600BAF59C /* JSValueRef.cpp in Sources */,
</span><span class="cx"> 86E3C61C167BABEE006D760A /* JSVirtualMachine.mm in Sources */,
</span><del>- 7B98D1361B60CD5F0023B1A4 /* JSWasmModule.cpp in Sources */,
</del><span class="cx"> A7CA3AE717DA41AE006538AF /* JSWeakMap.cpp in Sources */,
</span><span class="cx"> A7482B9411671147003B0712 /* JSWeakObjectMapRefPrivate.cpp in Sources */,
</span><span class="cx"> 709FB8671AE335C60039D069 /* JSWeakSet.cpp in Sources */,
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutablecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.cpp (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/runtime/Executable.cpp 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -31,7 +31,6 @@
</span><span class="cx"> #include "Debugger.h"
</span><span class="cx"> #include "JIT.h"
</span><span class="cx"> #include "JSCInlines.h"
</span><del>-#include "JSWasmModule.h"
</del><span class="cx"> #include "LLIntEntrypoint.h"
</span><span class="cx"> #include "Parser.h"
</span><span class="cx"> #include "TypeProfiler.h"
</span><span class="lines">@@ -747,10 +746,9 @@
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx"> const ClassInfo WebAssemblyExecutable::s_info = { "WebAssemblyExecutable", &ExecutableBase::s_info, 0, CREATE_METHOD_TABLE(WebAssemblyExecutable) };
</span><span class="cx">
</span><del>-WebAssemblyExecutable::WebAssemblyExecutable(VM& vm, const SourceCode& source, JSWasmModule* module, unsigned functionIndex)
</del><ins>+WebAssemblyExecutable::WebAssemblyExecutable(VM& vm, const SourceCode& source, unsigned functionIndex)
</ins><span class="cx"> : ExecutableBase(vm, vm.webAssemblyExecutableStructure.get(), NUM_PARAMETERS_NOT_COMPILED, NoIntrinsic)
</span><span class="cx"> , m_source(source)
</span><del>- , m_module(vm, this, module)
</del><span class="cx"> , m_functionIndex(functionIndex)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(source.provider()->sourceType() == SourceProviderSourceType::WebAssembly);
</span><span class="lines">@@ -768,7 +766,6 @@
</span><span class="cx"> ExecutableBase::visitChildren(thisObject, visitor);
</span><span class="cx"> if (thisObject->m_codeBlockForCall)
</span><span class="cx"> thisObject->m_codeBlockForCall->visitWeakly(visitor);
</span><del>- visitor.append(&thisObject->m_module);
</del><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreruntimeExecutableh"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/runtime/Executable.h (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/runtime/Executable.h 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/runtime/Executable.h 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -46,7 +46,6 @@
</span><span class="cx"> class EvalCodeBlock;
</span><span class="cx"> class FunctionCodeBlock;
</span><span class="cx"> class JSScope;
</span><del>-class JSWasmModule;
</del><span class="cx"> class LLIntOffsetsExtractor;
</span><span class="cx"> class ModuleProgramCodeBlock;
</span><span class="cx"> class ProgramCodeBlock;
</span><span class="lines">@@ -719,9 +718,9 @@
</span><span class="cx"> typedef ExecutableBase Base;
</span><span class="cx"> static const unsigned StructureFlags = Base::StructureFlags | StructureIsImmortal;
</span><span class="cx">
</span><del>- static WebAssemblyExecutable* create(VM& vm, const SourceCode& source, JSWasmModule* module, unsigned functionIndex)
</del><ins>+ static WebAssemblyExecutable* create(VM& vm, const SourceCode& source, unsigned functionIndex)
</ins><span class="cx"> {
</span><del>- WebAssemblyExecutable* executable = new (NotNull, allocateCell<WebAssemblyExecutable>(vm.heap)) WebAssemblyExecutable(vm, source, module, functionIndex);
</del><ins>+ WebAssemblyExecutable* executable = new (NotNull, allocateCell<WebAssemblyExecutable>(vm.heap)) WebAssemblyExecutable(vm, source, functionIndex);
</ins><span class="cx"> executable->finishCreation(vm);
</span><span class="cx"> return executable;
</span><span class="cx"> }
</span><span class="lines">@@ -744,12 +743,11 @@
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> friend class ExecutableBase;
</span><del>- WebAssemblyExecutable(VM&, const SourceCode&, JSWasmModule*, unsigned functionIndex);
</del><ins>+ WebAssemblyExecutable(VM&, const SourceCode&, unsigned functionIndex);
</ins><span class="cx">
</span><span class="cx"> static void visitChildren(JSCell*, SlotVisitor&);
</span><span class="cx">
</span><span class="cx"> SourceCode m_source;
</span><del>- WriteBarrier<JSWasmModule> m_module;
</del><span class="cx"> unsigned m_functionIndex;
</span><span class="cx">
</span><span class="cx"> WriteBarrier<WebAssemblyCodeBlock> m_codeBlockForCall;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmJSWasmModulecpp"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/wasm/JSWasmModule.cpp (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/JSWasmModule.cpp 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/wasm/JSWasmModule.cpp 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -1,71 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "JSWasmModule.h"
-
-#if ENABLE(WEBASSEMBLY)
-
-#include "AuxiliaryBarrierInlines.h"
-#include "HeapInlines.h"
-#include "JSArrayBuffer.h"
-#include "JSCJSValueInlines.h"
-#include "JSCellInlines.h"
-#include "JSFunction.h"
-#include "SlotVisitorInlines.h"
-#include "StructureInlines.h"
-
-namespace JSC {
-
-const ClassInfo JSWasmModule::s_info = { "WasmModule", &Base::s_info, 0, CREATE_METHOD_TABLE(JSWasmModule) };
-
-JSWasmModule::JSWasmModule(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
- : Base(vm, structure)
-{
- if (arrayBuffer)
- m_arrayBuffer.set(vm, this, arrayBuffer);
-}
-
-void JSWasmModule::destroy(JSCell* cell)
-{
- JSWasmModule* thisObject = jsCast<JSWasmModule*>(cell);
- thisObject->JSWasmModule::~JSWasmModule();
-}
-
-void JSWasmModule::visitChildren(JSCell* cell, SlotVisitor& visitor)
-{
- JSWasmModule* thisObject = jsCast<JSWasmModule*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, info());
- Base::visitChildren(thisObject, visitor);
- visitor.append(&thisObject->m_arrayBuffer);
- for (auto function : thisObject->m_functions)
- visitor.append(&function);
- for (auto importedFunction : thisObject->m_importedFunctions)
- visitor.append(&importedFunction);
-}
-
-} // namespace JSC
-
-#endif // ENABLE(WEBASSEMBLY)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmJSWasmModuleh"></a>
<div class="delfile"><h4>Deleted: trunk/Source/JavaScriptCore/wasm/JSWasmModule.h (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/JSWasmModule.h 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/wasm/JSWasmModule.h 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -1,115 +0,0 @@
</span><del>-/*
- * Copyright (C) 2015 Apple Inc. All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in the
- * documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. ``AS IS'' AND ANY
- * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
- * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#pragma once
-
-#if ENABLE(WEBASSEMBLY)
-
-#include "JSDestructibleObject.h"
-#include "WasmFormat.h"
-
-namespace JSC {
-
-class JSWasmModule : public JSDestructibleObject {
-public:
- typedef JSDestructibleObject Base;
-
- union GlobalVariable {
- GlobalVariable(int32_t value)
- : intValue(value)
- {
- }
- GlobalVariable(float value)
- : floatValue(value)
- {
- }
- GlobalVariable(double value)
- : doubleValue(value)
- {
- }
-
- int32_t intValue;
- float floatValue;
- double doubleValue;
- };
-
- static JSWasmModule* create(VM& vm, Structure* structure, JSArrayBuffer* arrayBuffer)
- {
- JSWasmModule* module = new (NotNull, allocateCell<JSWasmModule>(vm.heap)) JSWasmModule(vm, structure, arrayBuffer);
- module->finishCreation(vm);
- return module;
- }
-
- DECLARE_INFO;
-
- static Structure* createStructure(VM& vm, JSGlobalObject* globalObject)
- {
- return Structure::create(vm, globalObject, jsNull(), TypeInfo(ObjectType, StructureFlags), info());
- }
-
- static void destroy(JSCell*);
- static void visitChildren(JSCell*, SlotVisitor&);
-
- Vector<uint32_t>& i32Constants() { return m_i32Constants; }
- Vector<float>& f32Constants() { return m_f32Constants; }
- Vector<double>& f64Constants() { return m_f64Constants; }
- Vector<Wasm::Signature>& signatures() { return m_signatures; }
- Vector<Wasm::FunctionImport>& functionImports() { return m_functionImports; }
- Vector<Wasm::FunctionImportSignature>& functionImportSignatures() { return m_functionImportSignatures; }
- Vector<Wasm::Type>& globalVariableTypes() { return m_globalVariableTypes; }
- Vector<Wasm::FunctionDeclaration>& functionDeclarations() { return m_functionDeclarations; }
- Vector<Wasm::FunctionPointerTable>& functionPointerTables() { return m_functionPointerTables; }
-
- const JSArrayBuffer* arrayBuffer() const { return m_arrayBuffer.get(); }
- Vector<WriteBarrier<JSFunction>>& functions() { return m_functions; }
- Vector<unsigned>& functionStartOffsetsInSource() { return m_functionStartOffsetsInSource; }
- Vector<unsigned>& functionStackHeights() { return m_functionStackHeights; }
- Vector<GlobalVariable>& globalVariables() { return m_globalVariables; }
- Vector<WriteBarrier<JSFunction>>& importedFunctions() { return m_importedFunctions; }
-
-private:
- JSWasmModule(VM&, Structure*, JSArrayBuffer*);
-
- Vector<uint32_t> m_i32Constants;
- Vector<float> m_f32Constants;
- Vector<double> m_f64Constants;
- Vector<Wasm::Signature> m_signatures;
- Vector<Wasm::FunctionImport> m_functionImports;
- Vector<Wasm::FunctionImportSignature> m_functionImportSignatures;
- Vector<Wasm::Type> m_globalVariableTypes;
- Vector<Wasm::FunctionDeclaration> m_functionDeclarations;
- Vector<Wasm::FunctionPointerTable> m_functionPointerTables;
-
- WriteBarrier<JSArrayBuffer> m_arrayBuffer;
- Vector<WriteBarrier<JSFunction>> m_functions;
- Vector<unsigned> m_functionStartOffsetsInSource;
- Vector<unsigned> m_functionStackHeights;
- Vector<GlobalVariable> m_globalVariables;
- Vector<WriteBarrier<JSFunction>> m_importedFunctions;
-};
-
-} // namespace JSC
-
-#endif // ENABLE(WEBASSEMBLY)
</del></span></pre></div>
<a id="trunkSourceJavaScriptCorewasmWasmModuleParsercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp (207926 => 207927)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp 2016-10-26 23:19:32 UTC (rev 207926)
+++ trunk/Source/JavaScriptCore/wasm/WasmModuleParser.cpp 2016-10-26 23:57:13 UTC (rev 207927)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEBASSEMBLY)
</span><span class="cx">
</span><del>-#include "JSWasmModule.h"
</del><span class="cx"> #include "WasmFormat.h"
</span><span class="cx"> #include "WasmOps.h"
</span><span class="cx"> #include "WasmSections.h"
</span></span></pre>
</div>
</div>
</body>
</html>