[MERGE #1985 @MikeHolman] put wasm under experimental JS features flag

chakra-core · Nov 12, 2016 · e7302b3 · e7302b3
2 parents 2aaad03 + b09b62a
commit e7302b3
Show file tree

Hide file tree

Showing 10 changed files with 98 additions and 83 deletions.
diff --git a/lib/Common/ConfigFlagsList.h b/lib/Common/ConfigFlagsList.h
@@ -32,13 +32,12 @@ PHASE(All)
     PHASE(Delay)
         PHASE(Speculation)
         PHASE(GatherCodeGenData)
-    PHASE(Wasm)
-        PHASE(WasmBytecode)
-            PHASE(WasmParser)
-            PHASE(WasmReader)
-            PHASE(WasmSection)
-            PHASE(WasmLEB128)
-            PHASE(WasmFunctionBody)
+    PHASE(WasmBytecode)
+        PHASE(WasmParser)
+        PHASE(WasmReader)
+        PHASE(WasmSection)
+        PHASE(WasmLEB128)
+        PHASE(WasmFunctionBody)
         PHASE(WasmDeferred)
         PHASE(WasmNativeTypeCallTest)
         PHASE(WasmValidatePrejit)
@@ -380,6 +379,7 @@ PHASE(All)
 #else
     #define DEFAULT_CONFIG_SIMDJS               (false)
 #endif
+#define DEFAULT_CONFIG_WASM               (false)
 #define DEFAULT_CONFIG_BgJitDelayFgBuffer   (0)
 #define DEFAULT_CONFIG_BgJitPendingFuncCap  (31)
 #define DEFAULT_CONFIG_CurrentSourceInfo     (true)
@@ -832,6 +832,7 @@ FLAGNR(Boolean, AsmJsEdge             , "Enable asm.js features which may have b
     #define COMPILE_DISABLE_Simdjs 0
 #endif
 FLAGPR_REGOVR_EXP(Boolean, ES6, Simdjs, "Enable Simdjs", DEFAULT_CONFIG_SIMDJS)
+
 FLAGR(Boolean, Simd128TypeSpec, "Enable type-specialization of Simd128 symbols", false)
 
 FLAGNR(Boolean, AssertBreak           , "Debug break on assert", false)
@@ -1025,6 +1026,11 @@ FLAGPRA          (Boolean, ES6, ESSharedArrayBuffer    , sab     , "Enable Share
 
 // /ES6 (BLUE+1) features/flags
 
+#ifndef COMPILE_DISABLE_Wasm
+#define COMPILE_DISABLE_Wasm 0
+#endif
+FLAGPR_REGOVR_EXP(Boolean, ES6, Wasm, "Enable WebAssembly", DEFAULT_CONFIG_WASM)
+
 #ifdef ENABLE_PROJECTION
 FLAGNR(Boolean, WinRTDelegateInterfaces , "Treat WinRT Delegates as Interfaces when determining their resolvability.", DEFAULT_CONFIG_WinRTDelegateInterfaces)
 FLAGR(Boolean, WinRTAdaptiveApps        , "Enable the adaptive apps feature, allowing for variable projection."      , DEFAULT_CONFIG_WinRTAdaptiveApps)

diff --git a/lib/Runtime/Base/ThreadConfigFlagsList.h b/lib/Runtime/Base/ThreadConfigFlagsList.h
@@ -48,6 +48,7 @@ FLAG_RELEASE(IsES7AsyncAndAwaitEnabled, ES7AsyncAwait)
 FLAG_RELEASE(IsArrayBufferTransferEnabled, ArrayBufferTransfer)
 FLAG_RELEASE(IsESObjectGetOwnPropertyDescriptorsEnabled, ESObjectGetOwnPropertyDescriptors)
 FLAG_RELEASE(IsESSharedArrayBufferEnabled, ESSharedArrayBuffer)
+FLAG_RELEASE(IsWasmEnabled, Wasm)
 #ifdef ENABLE_PROJECTION
 FLAG(AreWinRTDelegatesInterfaces, WinRTDelegateInterfaces)
 FLAG_RELEASE(IsWinRTAdaptiveAppsEnabled, WinRTAdaptiveApps)

diff --git a/lib/Runtime/Library/JavascriptLibrary.cpp b/lib/Runtime/Library/JavascriptLibrary.cpp
@@ -307,7 +307,7 @@ namespace Js
         INIT_ERROR_PROTO(uriErrorPrototype, InitializeURIErrorPrototype);
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             INIT_ERROR_PROTO(webAssemblyCompileErrorPrototype, InitializeWebAssemblyCompileErrorPrototype);
             INIT_ERROR_PROTO(webAssemblyRuntimeErrorPrototype, InitializeWebAssemblyRuntimeErrorPrototype);
@@ -363,7 +363,7 @@ namespace Js
             DeferredTypeHandler<InitializeStringIteratorPrototype, DefaultDeferredTypeFilter, true>::GetDefaultInstance()));
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             webAssemblyMemoryPrototype = DynamicObject::New(recycler,
                 DynamicType::New(scriptContext, TypeIds_Object, objectPrototype, nullptr,
@@ -467,7 +467,7 @@ namespace Js
         INIT_SIMPLE_TYPE(uriErrorType, TypeIds_Error, uriErrorPrototype);
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             INIT_SIMPLE_TYPE(webAssemblyCompileErrorType, TypeIds_Error, webAssemblyCompileErrorPrototype);
             INIT_SIMPLE_TYPE(webAssemblyRuntimeErrorType, TypeIds_Error, webAssemblyRuntimeErrorPrototype);
@@ -612,7 +612,7 @@ namespace Js
 #endif
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             webAssemblyModuleType = DynamicType::New(scriptContext, TypeIds_WebAssemblyModule, webAssemblyModulePrototype, nullptr, NullTypeHandler<false>::GetDefaultInstance(), true, true);
             webAssemblyInstanceType = DynamicType::New(scriptContext, TypeIds_WebAssemblyInstance, webAssemblyInstancePrototype, nullptr, NullTypeHandler<false>::GetDefaultInstance(), true, true);
@@ -1509,7 +1509,7 @@ namespace Js
         AddFunction(globalObject, PropertyIds::URIError, uriErrorConstructor);
 
 #ifdef ENABLE_WASM
-        if (PHASE_ON1(WasmPhase))
+        if (scriptContext->GetConfig()->IsWasmEnabled())
         {
             // new WebAssembly object
             webAssemblyObject = DynamicObject::New(recycler,

diff --git a/lib/Runtime/Library/WebAssemblyModule.cpp b/lib/Runtime/Library/WebAssemblyModule.cpp
@@ -94,7 +94,7 @@ WebAssemblyModule::CreateModule(
     const byte* buffer,
     const uint lengthBytes)
 {
-    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmPhase);
+    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmBytecodePhase);
     Unused(wasmPhase);
 
     WebAssemblyModule * webAssemblyModule = nullptr;
@@ -162,7 +162,7 @@ WebAssemblyModule::ValidateModule(
     const byte* buffer,
     const uint lengthBytes)
 {
-    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmPhase);
+    AutoProfilingPhase wasmPhase(scriptContext, Js::WasmBytecodePhase);
     Unused(wasmPhase);
 
     try

diff --git a/lib/WasmReader/WasmReader.h b/lib/WasmReader/WasmReader.h
@@ -20,7 +20,7 @@
     }
 
 // Level of tracing
-#define DO_WASM_TRACE_ALL       PHASE_TRACE1(Js::WasmPhase)
+#define DO_WASM_TRACE_ALL       PHASE_TRACE1(Js::WasmBytecodePhase)
 #define DO_WASM_TRACE_DECODER   DO_WASM_TRACE_ALL || PHASE_TRACE1(Js::WasmReaderPhase)
   #define DO_WASM_TRACE_SECTION DO_WASM_TRACE_DECODER || PHASE_TRACE1(Js::WasmSectionPhase)
 #define DO_WASM_TRACE_LEB128    DO_WASM_TRACE_ALL || PHASE_TRACE1(Js::WasmLEB128Phase)