[1.8>1.9] [MERGE #4600 @obastemur] es6module: enable test3257

Merge pull request #4600 from obastemur:enable_3257

Fixes #4575

bin/ch/Helpers.cpp

@@ -200,117 +200,129 @@ HRESULT Helpers::LoadScriptFromFile(LPCSTR filenameToLoad, LPCSTR& contents, UIN
         filename = combinedPathBuffer;
     }
 
-    //
-    // Open the file as a binary file to prevent CRT from handling encoding, line-break conversions,
-    // etc.
-    //
-    if (fopen_s(&file, filename, "rb") != 0)
+    // check if have it registered
+    AutoString *data;
+    if (SourceMap::Find(filenameToLoad, strlen(filenameToLoad), &data) ||
+        SourceMap::Find(filename, strlen(filename), &data))
     {
-        if (!HostConfigFlags::flags.MuteHostErrorMsgIsEnabled)
+        contents = data->GetString();
+        if (lengthBytesOut != nullptr)
         {
-#ifdef _WIN32
-            DWORD lastError = GetLastError();
-            char16 wszBuff[MAX_URI_LENGTH];
-            fprintf(stderr, "Error in opening file '%s' ", filename);
-            wszBuff[0] = 0;
-            if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
-                nullptr,
-                lastError,
-                0,
-                wszBuff,
-                _countof(wszBuff),
-                nullptr))
-            {
-                fwprintf(stderr, _u(": %s"), wszBuff);
-            }
-            fwprintf(stderr, _u("\n"));
-#elif defined(_POSIX_VERSION)
-            fprintf(stderr, "Error in opening file: ");
-            perror(filename);
-#endif
+            *lengthBytesOut = (UINT) data->GetLength();
         }
-
-        IfFailGo(E_FAIL);
     }
-
-    if (file != NULL)
+    else
     {
-        // Determine the file length, in bytes.
-        fseek(file, 0, SEEK_END);
-        lengthBytes = ftell(file);
-        fseek(file, 0, SEEK_SET);
-        const size_t bufferLength = lengthBytes + sizeof(BYTE);
-        pRawBytes = (LPBYTE)malloc(bufferLength);
-        if (nullptr == pRawBytes)
+        // Open the file as a binary file to prevent CRT from handling encoding, line-break conversions,
+        // etc.
+        if (fopen_s(&file, filename, "rb") != 0)
         {
-            fwprintf(stderr, _u("out of memory"));
-            IfFailGo(E_OUTOFMEMORY);
-        }
+            if (!HostConfigFlags::flags.MuteHostErrorMsgIsEnabled)
+            {
+    #ifdef _WIN32
+                DWORD lastError = GetLastError();
+                char16 wszBuff[MAX_URI_LENGTH];
+                fprintf(stderr, "Error in opening file '%s' ", filename);
+                wszBuff[0] = 0;
+                if (FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM,
+                    nullptr,
+                    lastError,
+                    0,
+                    wszBuff,
+                    _countof(wszBuff),
+                    nullptr))
+                {
+                    fwprintf(stderr, _u(": %s"), wszBuff);
+                }
+                fwprintf(stderr, _u("\n"));
+    #elif defined(_POSIX_VERSION)
+                fprintf(stderr, "Error in opening file: ");
+                perror(filename);
+    #endif
+            }
 
-        //
-        // Read the entire content as a binary block.
-        //
-        size_t readBytes = fread(pRawBytes, sizeof(BYTE), lengthBytes, file);
-        if (readBytes < lengthBytes * sizeof(BYTE))
-        {
             IfFailGo(E_FAIL);
         }
 
-        pRawBytes[lengthBytes] = 0; // Null terminate it. Could be UTF16
-
-        //
-        // Read encoding to make sure it's supported
-        //
-        // Warning: The UNICODE buffer for parsing is supposed to be provided by the host.
-        // This is not a complete read of the encoding. Some encodings like UTF7, UTF1, EBCDIC, SCSU, BOCU could be
-        // wrongly classified as ANSI
-        //
+        if (file != NULL)
         {
-#pragma warning(push)
-// suppressing prefast warning that "readable size is bufferLength bytes but 2 may be read" as bufferLength is clearly > 2 in the code that follows
-#pragma warning(disable:6385)
-            C_ASSERT(sizeof(WCHAR) == 2);
-            if (bufferLength > 2)
+            // Determine the file length, in bytes.
+            fseek(file, 0, SEEK_END);
+            lengthBytes = ftell(file);
+            fseek(file, 0, SEEK_SET);
+            const size_t bufferLength = lengthBytes + sizeof(BYTE);
+            pRawBytes = (LPBYTE)malloc(bufferLength);
+            if (nullptr == pRawBytes)
             {
-                __analysis_assume(bufferLength > 2);
-#pragma prefast(push)
-#pragma prefast(disable:6385, "PREfast incorrectly reports this as an out-of-bound access.");
-                if ((pRawBytes[0] == 0xFE && pRawBytes[1] == 0xFF) ||
-                    (pRawBytes[0] == 0xFF && pRawBytes[1] == 0xFE) ||
-                    (bufferLength > 4 && pRawBytes[0] == 0x00 && pRawBytes[1] == 0x00 &&
-                        ((pRawBytes[2] == 0xFE && pRawBytes[3] == 0xFF) ||
-                         (pRawBytes[2] == 0xFF && pRawBytes[3] == 0xFE))))
+                fwprintf(stderr, _u("out of memory"));
+                IfFailGo(E_OUTOFMEMORY);
+            }
 
+            //
+            // Read the entire content as a binary block.
+            //
+            size_t readBytes = fread(pRawBytes, sizeof(BYTE), lengthBytes, file);
+            if (readBytes < lengthBytes * sizeof(BYTE))
+            {
+                IfFailGo(E_FAIL);
+            }
+
+            pRawBytes[lengthBytes] = 0; // Null terminate it. Could be UTF16
+
+            //
+            // Read encoding to make sure it's supported
+            //
+            // Warning: The UNICODE buffer for parsing is supposed to be provided by the host.
+            // This is not a complete read of the encoding. Some encodings like UTF7, UTF1, EBCDIC, SCSU, BOCU could be
+            // wrongly classified as ANSI
+            //
+            {
+    #pragma warning(push)
+    // suppressing prefast warning that "readable size is bufferLength bytes but 2 may be read" as bufferLength is clearly > 2 in the code that follows
+    #pragma warning(disable:6385)
+                C_ASSERT(sizeof(WCHAR) == 2);
+                if (bufferLength > 2)
                 {
-                    // unicode unsupported
-                    fwprintf(stderr, _u("unsupported file encoding. Only ANSI and UTF8 supported"));
-                    IfFailGo(E_UNEXPECTED);
+                    __analysis_assume(bufferLength > 2);
+    #pragma prefast(push)
+    #pragma prefast(disable:6385, "PREfast incorrectly reports this as an out-of-bound access.");
+                    if ((pRawBytes[0] == 0xFE && pRawBytes[1] == 0xFF) ||
+                        (pRawBytes[0] == 0xFF && pRawBytes[1] == 0xFE) ||
+                        (bufferLength > 4 && pRawBytes[0] == 0x00 && pRawBytes[1] == 0x00 &&
+                            ((pRawBytes[2] == 0xFE && pRawBytes[3] == 0xFF) ||
+                            (pRawBytes[2] == 0xFF && pRawBytes[3] == 0xFE))))
+
+                    {
+                        // unicode unsupported
+                        fwprintf(stderr, _u("unsupported file encoding. Only ANSI and UTF8 supported"));
+                        IfFailGo(E_UNEXPECTED);
+                    }
+    #pragma prefast(pop)
                 }
-#pragma prefast(pop)
             }
+    #pragma warning(pop)
         }
-#pragma warning(pop)
-    }
 
-    contents = reinterpret_cast<LPCSTR>(pRawBytes);
+        contents = reinterpret_cast<LPCSTR>(pRawBytes);
 
-Error:
-    if (SUCCEEDED(hr))
-    {
-        if (lengthBytesOut)
+    Error:
+        if (SUCCEEDED(hr))
         {
-            *lengthBytesOut = lengthBytes;
+            if (lengthBytesOut)
+            {
+                *lengthBytesOut = lengthBytes;
+            }
         }
-    }
 
-    if (file != NULL)
-    {
-        fclose(file);
-    }
+        if (file != NULL)
+        {
+            fclose(file);
+        }
 
-    if (pRawBytes && reinterpret_cast<LPCSTR>(pRawBytes) != contents)
-    {
-        free(pRawBytes);
+        if (pRawBytes && reinterpret_cast<LPCSTR>(pRawBytes) != contents)
+        {
+            free(pRawBytes);
+        }
     }
 
     return hr;

bin/ch/stdafx.h

@@ -316,11 +316,16 @@ public:
     }
 
     static bool Find(AutoString &path, AutoString ** out)
+    {
+        return Find(path.GetString(), path.GetLength(), out);
+    }
+
+    static bool Find(LPCSTR path, size_t pathLength, AutoString ** out)
     {
         FileNode * node = root;
         while(node != nullptr)
         {
-            if (strncmp(node->path.GetString(), path.GetString(), path.GetLength()) == 0)
+            if (strncmp(node->path.GetString(), path, pathLength) == 0)
             {
                 *out = &(node->data);
                 return true;

test/es6/bug_issue_3257.js

@@ -1,7 +0,0 @@
-//-------------------------------------------------------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
-//-------------------------------------------------------------------------------------------------------
-
-WScript.LoadScriptFile("bug_issue_3257_mod/mod0.js", "module");
-WScript.LoadScriptFile("bug_issue_3257_script/script0.js");

test/es6/bug_issue_3257_mod/mod0.js

@@ -1,9 +0,0 @@
-//-------------------------------------------------------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
-//-------------------------------------------------------------------------------------------------------
-
-import 'bug_issue_3257_mod1.js';
-import 'bug_issue_3257_mod2/mod2.js';
-
-console.log("mod0");

test/es6/bug_issue_3257_mod1.js

@@ -1,7 +0,0 @@
-//-------------------------------------------------------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
-//-------------------------------------------------------------------------------------------------------
-
-import './bug_issue_3257_mod2/mod2.js';
-console.log("mod1");

test/es6/bug_issue_3257_mod2/mod2.js

@@ -1,7 +0,0 @@
-//-------------------------------------------------------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
-//-------------------------------------------------------------------------------------------------------
-
-import 'bug_issue_3257_mod/mod0.js';
-console.log("mod2");

test/es6/bug_issue_3257_script/script0.js

@@ -1,8 +0,0 @@
-//-------------------------------------------------------------------------------------------------------
-// Copyright (C) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
-//-------------------------------------------------------------------------------------------------------
-
-console.log("script0");
-import('bug_issue_3257_mod1.js');
-import('bug_issue_3257_mod2/mod2.js');

test/es6/rlexe.xml

@@ -1367,16 +1367,6 @@
       <tags>BugFix,exclude_sanitize_address</tags>
     </default>
   </test>
-  <!-- OS#14303885, disabling failing test until issue is resolved
-  <test>
-    <default>
-      <files>bug_issue_3257.js</files>
-      <compile-flags>-ESDynamicImport</compile-flags>
-      <baseline>bug_issue_3257.baseline</baseline>
-      <tags>BugFix,exclude_sanitize_address</tags>
-    </default>
-  </test>
-  -->
   <test>
     <default>
       <files>typedarray_bugs.js</files>

test/es6module/bug_issue_3257.js

@@ -0,0 +1,30 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
+WScript.RegisterModuleSource("mod0.js", `
+    import 'mod1.js';
+    import 'mod2.js';
+
+    console.log("mod0");
+`);
+
+WScript.RegisterModuleSource("mod1.js",`
+    import 'mod2.js';
+    console.log("mod1");
+`);
+
+WScript.RegisterModuleSource("mod2.js",`
+    import 'mod0.js';
+    console.log("mod2");
+`);
+
+WScript.RegisterModuleSource("script0.js",`
+    console.log("script0");
+    import('mod1.js');
+    import('mod2.js');
+`);
+
+WScript.LoadScriptFile("mod0.js", "module");
+WScript.LoadScriptFile("script0.js");

test/es6module/rlexe.xml

@@ -126,4 +126,12 @@
       <tags>BugFix,exclude_sanitize_address</tags>
     </default>
   </test>
+  <test>
+    <default>
+      <files>bug_issue_3257.js</files>
+      <compile-flags>-ESDynamicImport</compile-flags>
+      <baseline>bug_issue_3257.baseline</baseline>
+      <tags>BugFix,exclude_sanitize_address</tags>
+    </default>
+  </test>
 </regress-exe>