Changeset 187538 in webkit

Timestamp:

Jul 28, 2015, 8:27:23 PM (10 years ago)

Author:

[email protected]

Message:

Unreviewed, rolling out r187531.
​https://bugs.webkit.org/show_bug.cgi?id=147397

Broke Windows bild (Requested by smfr on #webkit).

Reverted changeset:

"Implement WebAssembly module parser"
​https://bugs.webkit.org/show_bug.cgi?id=147293
​http://trac.webkit.org/changeset/187531

Location:

trunk/Source/JavaScriptCore

Files:

• CMakeLists.txt (modified) (1 diff)
• ChangeLog (modified) (1 diff)
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj (modified) (2 diffs)
• JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters (modified) (2 diffs)
• JavaScriptCore.xcodeproj/project.pbxproj (modified) (8 diffs)
• jsc.cpp (modified) (5 diffs)
• parser/SourceProvider.h (modified) (1 diff)
• runtime/JSGlobalObject.cpp (modified) (3 diffs)
• runtime/JSGlobalObject.h (modified) (2 diffs)
• wasm/WASMMagicNumber.h (deleted)
• wasm/WASMModuleParser.cpp (deleted)
• wasm/WASMModuleParser.h (deleted)
• wasm/WASMReader.cpp (deleted)
• wasm/WASMReader.h (deleted)

trunk/Source/JavaScriptCore/CMakeLists.txt

@@ -412 +412 @@
 
     wasm/JSWASMModule.cpp
-    wasm/WASMModuleParser.cpp
-    wasm/WASMReader.cpp
 
     yarr/RegularExpression.cpp

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2015-07-28  Commit Queue  <[email protected]>
+
+        Unreviewed, rolling out r187531.
+        https://bugs.webkit.org/show_bug.cgi?id=147397
+
+        Broke Windows bild (Requested by smfr on #webkit).
+
+        Reverted changeset:
+
+        "Implement WebAssembly module parser"
+        https://bugs.webkit.org/show_bug.cgi?id=147293
+        http://trac.webkit.org/changeset/187531
+
 2015-07-28  Benjamin Poulain  <[email protected]>
 

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

@@ -869 +869 @@
     <ClCompile Include="..\tools\JSDollarVMPrototype.cpp" />
     <ClCompile Include="..\wasm\JSWASMModule.cpp" />
-    <ClCompile Include="..\wasm\WASMModuleParser.cpp" />
-    <ClCompile Include="..\wasm\WASMReader.cpp" />
     <ClCompile Include="..\yarr\RegularExpression.cpp" />
     <ClCompile Include="..\yarr\YarrCanonicalizeUCS2.cpp" />
@@ -1737 +1735 @@
     <ClInclude Include="..\tools\TieredMMapArray.h" />
     <ClInclude Include="..\wasm\JSWASMModule.h" />
-    <ClInclude Include="..\wasm\WASMMagicNumber.h" />
-    <ClInclude Include="..\wasm\WASMModuleParser.h" />
-    <ClInclude Include="..\wasm\WASMReader.h" />
     <ClInclude Include="..\yarr\RegularExpression.h" />
     <ClInclude Include="..\yarr\Yarr.h" />

trunk/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

@@ -1798 +1798 @@
       <Filter>wasm</Filter>
     </ClCompile>
-    <ClCompile Include="..\wasm\WASMModuleParser.cpp">
-      <Filter>wasm</Filter>
-    </ClCompile>
-    <ClCompile Include="..\wasm\WASMReader.cpp">
-      <Filter>wasm</Filter>
-    </ClCompile>
   </ItemGroup>
   <ItemGroup>
@@ -4308 +4302 @@
       <Filter>wasm</Filter>
     </ClInclude>
-    <ClInclude Include="..\wasm\WASMMagicNumber.h">
-      <Filter>wasm</Filter>
-    </ClInclude>
-    <ClInclude Include="..\wasm\WASMModuleParser.h">
-      <Filter>wasm</Filter>
-    </ClInclude>
-    <ClInclude Include="..\wasm\WASMReader.h">
-      <Filter>wasm</Filter>
-    </ClInclude>
   </ItemGroup>
   <ItemGroup>

trunk/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

@@ -1022 +1022 @@
                 79EE0BFF1B4AFB85000385C9 /* VariableEnvironment.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 79EE0BFD1B4AFB85000385C9 /* VariableEnvironment.cpp */; };
                 79EE0C001B4AFB85000385C9 /* VariableEnvironment.h in Headers */ = {isa = PBXBuildFile; fileRef = 79EE0BFE1B4AFB85000385C9 /* VariableEnvironment.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                7B39F76D1B62DE2E00360FB4 /* WASMModuleParser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B39F7691B62DE2200360FB4 /* WASMModuleParser.cpp */; };
-                7B39F76E1B62DE3200360FB4 /* WASMModuleParser.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B39F76A1B62DE2200360FB4 /* WASMModuleParser.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                7B39F7701B62DE3200360FB4 /* WASMReader.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B39F76C1B62DE2200360FB4 /* WASMReader.h */; settings = {ATTRIBUTES = (Private, ); }; };
-                7B39F7721B63574D00360FB4 /* WASMReader.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 7B39F7711B63574B00360FB4 /* WASMReader.cpp */; };
-                7B7A5E271B68288C0027CAD0 /* WASMMagicNumber.h in Headers */ = {isa = PBXBuildFile; fileRef = 7B7A5E261B6828840027CAD0 /* WASMMagicNumber.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 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, ); }; };
@@ -2775 +2770 @@
                 79EE0BFD1B4AFB85000385C9 /* VariableEnvironment.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = VariableEnvironment.cpp; sourceTree = "<group>"; };
                 79EE0BFE1B4AFB85000385C9 /* VariableEnvironment.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VariableEnvironment.h; sourceTree = "<group>"; };
-                7B39F7691B62DE2200360FB4 /* WASMModuleParser.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMModuleParser.cpp; sourceTree = "<group>"; };
-                7B39F76A1B62DE2200360FB4 /* WASMModuleParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMModuleParser.h; sourceTree = "<group>"; };
-                7B39F76C1B62DE2200360FB4 /* WASMReader.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMReader.h; sourceTree = "<group>"; };
-                7B39F7711B63574B00360FB4 /* WASMReader.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WASMReader.cpp; sourceTree = "<group>"; };
-                7B7A5E261B6828840027CAD0 /* WASMMagicNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WASMMagicNumber.h; sourceTree = "<group>"; };
                 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>"; };
@@ -4318 +4308 @@
                                 7B98D1341B60CD5A0023B1A4 /* JSWASMModule.cpp */,
                                 7B98D1351B60CD5A0023B1A4 /* JSWASMModule.h */,
-                                7B7A5E261B6828840027CAD0 /* WASMMagicNumber.h */,
-                                7B39F7691B62DE2200360FB4 /* WASMModuleParser.cpp */,
-                                7B39F76A1B62DE2200360FB4 /* WASMModuleParser.h */,
-                                7B39F7711B63574B00360FB4 /* WASMReader.cpp */,
-                                7B39F76C1B62DE2200360FB4 /* WASMReader.h */,
                         );
                         path = wasm;
@@ -6230 +6215 @@
                                 0F2B66F517B6B5AB00A7AE3F /* JSGenericTypedArrayViewPrototype.h in Headers */,
                                 0F2B66F617B6B5AB00A7AE3F /* JSGenericTypedArrayViewPrototypeInlines.h in Headers */,
-                                7B39F76E1B62DE3200360FB4 /* WASMModuleParser.h in Headers */,
                                 BC18C4210E16F5CD00B34460 /* JSGlobalObject.h in Headers */,
                                 A5FD0086189B1B7E00633231 /* JSGlobalObjectConsoleAgent.h in Headers */,
@@ -6442 +6426 @@
                                 0FF7168C15A3B235008F5DAA /* PropertyOffset.h in Headers */,
                                 A785F6BC18C553FE00F10626 /* SpillRegistersMode.h in Headers */,
-                                7B7A5E271B68288C0027CAD0 /* WASMMagicNumber.h in Headers */,
                                 BC18C4550E16F5CD00B34460 /* PropertySlot.h in Headers */,
                                 0FB7F39C15ED8E4600F167B2 /* PropertyStorage.h in Headers */,
@@ -6576 +6559 @@
                                 A7B601821639FD2A00372BA3 /* UnlinkedCodeBlock.h in Headers */,
                                 0F2E892C16D028AD009E4FD2 /* UnusedPointer.h in Headers */,
-                                7B39F7701B62DE3200360FB4 /* WASMReader.h in Headers */,
                                 0F963B3813FC6FE90002D9B2 /* ValueProfile.h in Headers */,
                                 0F426A481460CBB300131F8F /* ValueRecovery.h in Headers */,
@@ -7211 +7193 @@
                                 0F9D36941AE9CC33000D4DFB /* DFGCleanUpPhase.cpp in Sources */,
                                 A7D89CF717A0B8CC00773AD8 /* DFGFlushFormat.cpp in Sources */,
-                                7B39F76D1B62DE2E00360FB4 /* WASMModuleParser.cpp in Sources */,
                                 0F3A1BF91A9ECB7D000DE01A /* DFGPutStackSinkingPhase.cpp in Sources */,
                                 86EC9DC71328DF82002B2AD7 /* DFGGraph.cpp in Sources */,
@@ -7626 +7607 @@
                                 62D2D38F1ADF103F000206C1 /* FunctionRareData.cpp in Sources */,
                                 0F7700921402FF3C0078EB39 /* SamplingCounter.cpp in Sources */,
-                                7B39F7721B63574D00360FB4 /* WASMReader.cpp in Sources */,
                                 1429D8850ED21C3D00B89619 /* SamplingTool.cpp in Sources */,
                                 70EC0EC61AA0D7DA00B6AAFA /* StringIteratorPrototype.cpp in Sources */,

trunk/Source/JavaScriptCore/jsc.cpp

@@ -44 +44 @@
 #include "JSProxy.h"
 #include "JSString.h"
-#include "JSWASMModule.h"
 #include "ProfilerDatabase.h"
 #include "SamplingTool.h"
@@ -52 +51 @@
 #include "TestRunnerUtils.h"
 #include "TypeProfilerLog.h"
-#include "WASMModuleParser.h"
 #include <math.h>
 #include <stdio.h>
@@ -495 +493 @@
 static EncodedJSValue JSC_HOST_CALL functionHasBasicBlockExecuted(ExecState*);
 static EncodedJSValue JSC_HOST_CALL functionEnableExceptionFuzz(ExecState*);
-#if ENABLE(WEBASSEMBLY)
-static EncodedJSValue JSC_HOST_CALL functionLoadWebAssembly(ExecState*);
-#endif
 
 #if ENABLE(SAMPLING_FLAGS)
@@ -661 +656 @@
         addFunction(vm, "enableExceptionFuzz", functionEnableExceptionFuzz, 0);
         
-#if ENABLE(WEBASSEMBLY)
-        addFunction(vm, "loadWebAssembly", functionLoadWebAssembly, 1);
-#endif
-
         JSArray* array = constructEmptyArray(globalExec(), 0);
         for (size_t i = 0; i < arguments.size(); ++i)
@@ -1192 +1183 @@
     return JSValue::encode(jsUndefined());
 }
-
-#if ENABLE(WEBASSEMBLY)
-EncodedJSValue JSC_HOST_CALL functionLoadWebAssembly(ExecState* exec)
-{
-    String fileName = exec->argument(0).toString(exec)->value(exec);
-    Vector<char> buffer;
-    if (!fillBufferWithContentsOfFile(fileName, buffer))
-        return JSValue::encode(exec->vm().throwException(exec, createError(exec, ASCIILiteral("Could not open file."))));
-    RefPtr<WebAssemblySourceProvider> sourceProvider = WebAssemblySourceProvider::create(reinterpret_cast<Vector<uint8_t>&>(buffer), fileName);
-    SourceCode source(sourceProvider);
-    String errorMessage;
-    JSWASMModule* module = parseWebAssembly(exec, source, errorMessage);
-    if (!module)
-        return JSValue::encode(exec->vm().throwException(exec, createSyntaxError(exec, errorMessage)));
-    return JSValue::encode(module);
-}
-#endif
 
 // Use SEH for Release builds only to get rid of the crash report dialog

trunk/Source/JavaScriptCore/parser/SourceProvider.h

@@ -95 +95 @@
     };
     
-#if ENABLE(WEBASSEMBLY)
-    class WebAssemblySourceProvider : public SourceProvider {
-    public:
-        static Ref<WebAssemblySourceProvider> create(const Vector<uint8_t>& data, const String& url)
-        {
-            return adoptRef(*new WebAssemblySourceProvider(data, url));
-        }
-
-        virtual const String& source() const override
-        {
-            return m_source;
-        }
-
-        const Vector<uint8_t>& data() const
-        {
-            return m_data;
-        }
-
-    private:
-        WebAssemblySourceProvider(const Vector<uint8_t>& data, const String& url)
-            : SourceProvider(url, TextPosition::minimumPosition())
-            , m_source("[WebAssembly source]")
-            , m_data(data)
-        {
-        }
-
-        String m_source;
-        Vector<uint8_t> m_data;
-    };
-#endif
-
 } // namespace JSC
 

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.cpp

@@ -93 +93 @@
 #include "JSTypedArrayPrototypes.h"
 #include "JSTypedArrays.h"
-#include "JSWASMModule.h"
 #include "JSWeakMap.h"
 #include "JSWeakSet.h"
@@ -342 +341 @@
     m_promiseStructure.set(vm, this, JSPromise::createStructure(vm, this, m_promisePrototype.get()));
 
-#if ENABLE(WEBASSEMBLY)
-    m_wasmModuleStructure.set(vm, this, JSWASMModule::createStructure(vm, this));
-#endif
-
     m_parseIntFunction.set(vm, this, JSFunction::create(vm, this, 2, vm.propertyNames->parseInt.string(), globalFuncParseInt, NoIntrinsic));
     putDirectWithoutTransition(vm, vm.propertyNames->parseInt, m_parseIntFunction.get(), DontEnum | Function);
@@ -807 +802 @@
     visitor.append(&thisObject->m_internalFunctionStructure);
     visitor.append(&thisObject->m_promiseStructure);
-#if ENABLE(WEBASSEMBLY)
-    visitor.append(&thisObject->m_wasmModuleStructure);
-#endif
 
 #define VISIT_SIMPLE_TYPE(CapitalName, lowerName, properName, instanceType, jsName) \

trunk/Source/JavaScriptCore/runtime/JSGlobalObject.h

@@ -244 +244 @@
     WriteBarrier<Structure> m_regExpMatchesArrayStructure;
     WriteBarrier<Structure> m_promiseStructure;
-#if ENABLE(WEBASSEMBLY)
-    WriteBarrier<Structure> m_wasmModuleStructure;
-#endif
 
 #define DEFINE_STORAGE_FOR_SIMPLE_TYPE(capitalName, lowerName, properName, instanceType, jsName) \
@@ -479 +476 @@
     Structure* regExpMatchesArrayStructure() const { return m_regExpMatchesArrayStructure.get(); }
     Structure* promiseStructure() const { return m_promiseStructure.get(); }
-#if ENABLE(WEBASSEMBLY)
-    Structure* wasmModuleStructure() const { return m_wasmModuleStructure.get(); }
-#endif
 
     JS_EXPORT_PRIVATE void setRemoteDebuggingEnabled(bool);