[Merge chakra-core/ChakraCore@241da53bd4] [1.6>1.7] [MERGE #3546 @Mik…

…eHolman] disable asm.js in ES6 modules Merge pull request #3546 from MikeHolman:asmmodule OS: 12464067
nodejs · Sep 25, 2017 · 4ca31d4 · 4ca31d4
1 parent 4b7cfa8
commit 4ca31d4
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 9 deletions.
diff --git a/deps/chakrashim/core/lib/Runtime/Language/SourceTextModuleRecord.cpp b/deps/chakrashim/core/lib/Runtime/Language/SourceTextModuleRecord.cpp
@@ -127,7 +127,7 @@ namespace Js
                 srcInfo->moduleID = moduleId;
 
                 LoadScriptFlag loadScriptFlag = (LoadScriptFlag)(LoadScriptFlag_Expression | LoadScriptFlag_Module |
-                    (isUtf8 ? LoadScriptFlag_Utf8Source : LoadScriptFlag_None));
+                    LoadScriptFlag_disableAsmJs | (isUtf8 ? LoadScriptFlag_Utf8Source : LoadScriptFlag_None));
 
                 Utf8SourceInfo* pResultSourceInfo = nullptr;
                 this->parseTree = scriptContext->ParseScript(parser, sourceText,

diff --git a/deps/chakrashim/core/test/AsmJs/badFunctionType.baseline b/deps/chakrashim/core/test/AsmJs/badFunctionType.baseline
@@ -56,13 +56,10 @@ default, rest & destructuring args not allowed
 Asm.js compilation failed.
 
 Running test 14: kFunctionIsModule
-Warning test disabled
 
 Running test 15: asm.js function in Module
-Warning test disabled
 
 Running test 16: kFunctionIsDefaultModuleExport
-Warning test disabled
 
 Running test 17: kFunctionHasSuperReference
 invalid function flags detected

diff --git a/deps/chakrashim/core/test/AsmJs/badFunctionType.js b/deps/chakrashim/core/test/AsmJs/badFunctionType.js
@@ -189,8 +189,6 @@ const tests = [{
   `)
   }
 }, {
-  // Todo:: bug #12464098
-  disabled: true,
   name: "kFunctionIsModule",
   test() { WScript.LoadModule(`
     "use asm"
@@ -200,8 +198,6 @@ const tests = [{
     }`)
   }
 }, {
-  // found bugs in jsrt api
-  disabled: true,
   name: "asm.js function in Module",
   test() {
     WScript.LoadModule(`
@@ -211,7 +207,6 @@ const tests = [{
     }`)
   }
 }, {
-  disabled: true,
   name: "kFunctionIsDefaultModuleExport",
   test() {
     WScript.LoadModule(`