Merge branch 'master' into build/arunetm/wasm.simd-merge

Author: arunetm

CMakeLists.txt

@@ -346,9 +346,14 @@ if(CLR_CMAKE_PLATFORM_XPLAT)
     add_compile_options(
         -fasm-blocks
         -fms-extensions
-        -fwrapv                 # Treat signed integer overflow as two's complement
+        -fwrapv # Treat signed integer overflow as two's complement
     )
 
+    # Only disable RTTI in release builds so that TrackAlloc works for debug and test builds
+    if(CMAKE_BUILD_TYPE STREQUAL Release)
+        add_compile_options(-fno-rtti)
+    endif()
+
     # Clang -fsanitize.
     if (CLANG_SANITIZE_SH)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fsanitize=${CLANG_SANITIZE_SH}")

RegenAllByteCode.cmd

@@ -38,6 +38,14 @@ if %errorlevel% neq 0 (
 )
 popd
 
+pushd lib\Runtime\Library\JsBuiltIn
+call GenByteCode.cmd
+if %errorlevel% neq 0 (
+  echo There was an error when regenerating bytecode header.
+  exit /b 1
+)
+popd
+
 :: ch.exe        x64_debug (NoJIT)
 :: ch.exe        x86_debug (NoJIT)
 call jenkins\buildone.cmd x64 debug "/p:BuildJIT=false"
@@ -61,6 +69,15 @@ if %errorlevel% neq 0 (
 )
 popd
 
+:: Generate BuiltIn NoJIT Bytecodes using ch.exe (NoJIT)
+pushd lib\Runtime\Library\JsBuiltIn
+call GenByteCode.cmd -nojit
+if %errorlevel% neq 0 (
+  echo There was an error when regenerating bytecode header for NoJIT.
+  exit /b 1
+)
+popd
+
 popd
 
 endlocal

bin/NativeTests/JsRTApiTest.cpp

@@ -2063,6 +2063,7 @@ namespace JsRTApiTest
         JsRTApiTest::WithSetup(JsRuntimeAttributeEnableExperimentalFeatures, ReentrantParseModuleTest);
     }
 
+
     ModuleResponseData reentrantNoErrorParseData;
     static JsErrorCode CALLBACK reentrantNoErrorParse_FIMC(_In_ JsModuleRecord referencingModule, _In_ JsValueRef specifier, _Outptr_result_maybenull_ JsModuleRecord* dependentModuleRecord)
     {
@@ -2131,6 +2132,50 @@ namespace JsRTApiTest
         JsRTApiTest::WithSetup(JsRuntimeAttributeEnableExperimentalFeatures, ReentrantNoErrorParseModuleTest);
     }
 
+    static JsErrorCode CALLBACK FIMC1(_In_ JsModuleRecord referencingModule, _In_ JsValueRef specifier, _Outptr_result_maybenull_ JsModuleRecord* dependentModuleRecord)
+    {
+        JsModuleRecord moduleRecord = JS_INVALID_REFERENCE;
+        LPCWSTR specifierStr;
+        size_t length;
+        JsErrorCode errorCode = JsStringToPointer(specifier, &specifierStr, &length);
+        REQUIRE(errorCode == JsNoError);
+
+        if (wcscmp(specifierStr, _u("foo.js")) == 0)
+        {
+            errorCode = JsInitializeModuleRecord(referencingModule, specifier, &moduleRecord);
+            REQUIRE(errorCode == JsNoError);
+        }
+
+        *dependentModuleRecord = moduleRecord;
+        return JsNoError;
+    }
+
+    static JsErrorCode CALLBACK NMRC1(_In_opt_ JsModuleRecord referencingModule, _In_opt_ JsValueRef exceptionVar)
+    {
+        // NotifyModuleReadyCallback handling.
+
+        return JsNoError;
+    }
+
+    void SomebugTest(JsRuntimeAttributes attributes, JsRuntimeHandle runtime)
+    {
+        JsModuleRecord rec;
+        JsInitializeModuleRecord(nullptr, nullptr, &rec);
+        JsSetModuleHostInfo(rec, JsModuleHostInfo_FetchImportedModuleCallback, FIMC1);
+        JsSetModuleHostInfo(rec, JsModuleHostInfo_FetchImportedModuleFromScriptCallback, FIMC1);
+        JsSetModuleHostInfo(rec, JsModuleHostInfo_NotifyModuleReadyCallback, NMRC1);
+
+        JsValueRef F = JS_INVALID_REFERENCE;
+        JsErrorCode err = JsRunScript(_u("var j = import('foo.js').then(mod => { mod.bar(); })"), 0, _u(""), &F);
+
+        CHECK(err == JsNoError);
+    }
+
+    TEST_CASE("ApiTest_SomebugTest", "[ApiTest]")
+    {
+        JsRTApiTest::WithSetup(JsRuntimeAttributeEnableExperimentalFeatures, SomebugTest);
+
+    }
     void ObjectHasOwnPropertyMethodTest(JsRuntimeAttributes attributes, JsRuntimeHandle runtime)
     {
         JsValueRef proto = JS_INVALID_REFERENCE;

bin/ch/WScriptJsrt.cpp

@@ -205,7 +205,7 @@ JsValueRef WScriptJsrt::LoadScriptFileHelper(JsValueRef callee, JsValueRef *argu
             }
             else
             {
-                returnValue = LoadScript(callee, *fileName, fileContent, *scriptInjectType ? *scriptInjectType : "self", isSourceModule, WScriptJsrt::FinalizeFree);
+                returnValue = LoadScript(callee, *fileName, fileContent, *scriptInjectType ? *scriptInjectType : "self", isSourceModule, WScriptJsrt::FinalizeFree, true);
             }
         }
     }
@@ -258,6 +258,7 @@ JsValueRef WScriptJsrt::LoadScriptHelper(JsValueRef callee, bool isConstructCall
         AutoString fileName;
         AutoString scriptInjectType;
         char fileNameBuffer[MAX_PATH];
+        bool isFile = true;
 
         IfJsrtErrorSetGo(fileContent.Initialize(arguments[1]));
         // ExternalArrayBuffer Finalize will clean this up
@@ -275,17 +276,21 @@ JsValueRef WScriptJsrt::LoadScriptHelper(JsValueRef callee, bool isConstructCall
             }
         }
 
-        if (!fileNameNarrow && isSourceModule)
+        if (!fileNameNarrow)
         {
-            sprintf_s(fileNameBuffer, MAX_PATH, "moduleScript%i.js", (int)sourceContext);
-            fileNameNarrow = fileNameBuffer;
+            isFile = false;
+            if (isSourceModule)
+            {
+                sprintf_s(fileNameBuffer, MAX_PATH, "moduleScript%i.js", (int)sourceContext);
+                fileNameNarrow = fileNameBuffer;
+            }
         }
 
         if (*fileContent)
         {
             // TODO: This is CESU-8. How to tell the engine?
             // TODO: How to handle this source (script) life time?
-            returnValue = LoadScript(callee, fileNameNarrow, *fileContent, *scriptInjectType ? *scriptInjectType : "self", isSourceModule, WScriptJsrt::FinalizeFree);
+            returnValue = LoadScript(callee, fileNameNarrow, *fileContent, *scriptInjectType ? *scriptInjectType : "self", isSourceModule, WScriptJsrt::FinalizeFree, isFile);
         }
     }
 
@@ -347,7 +352,7 @@ void WScriptJsrt::GetDir(LPCSTR fullPathNarrow, std::string *fullDirNarrow)
     *fullDirNarrow = result;
 }
 
-JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileContent, LPCSTR fullName)
+JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileContent, LPCSTR fullName, bool isFile)
 {
     DWORD_PTR dwSourceCookie = WScriptJsrt::GetNextSourceContext();
     JsModuleRecord requestModule = JS_INVALID_REFERENCE;
@@ -390,6 +395,15 @@ JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileConten
 
     // ParseModuleSource is sync, while additional fetch & evaluation are async.
     unsigned int fileContentLength = (fileContent == nullptr) ? 0 : (unsigned int)strlen(fileContent);
+ 
+    if (isFile && fullName)
+    {
+        JsValueRef moduleUrl;
+        ChakraRTInterface::JsCreateString(fullName, strlen(fullName), &moduleUrl);
+        errorCode = ChakraRTInterface::JsSetModuleHostInfo(requestModule, JsModuleHostInfo_Url, moduleUrl);
+        IfJsrtErrorFail(errorCode, errorCode);
+    }
+ 
     errorCode = ChakraRTInterface::JsParseModuleSource(requestModule, dwSourceCookie, (LPBYTE)fileContent,
         fileContentLength, JsParseModuleSourceFlags_DataIsUTF8, &errorObject);
     if ((errorCode != JsNoError) && errorObject != JS_INVALID_REFERENCE && fileContent != nullptr && !HostConfigFlags::flags.IgnoreScriptErrorCode)
@@ -402,7 +416,7 @@ JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileConten
 
 
 JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
-    LPCSTR fileContent, LPCSTR scriptInjectType, bool isSourceModule, JsFinalizeCallback finalizeCallback)
+    LPCSTR fileContent, LPCSTR scriptInjectType, bool isSourceModule, JsFinalizeCallback finalizeCallback, bool isFile)
 {
     HRESULT hr = E_FAIL;
     JsErrorCode errorCode = JsNoError;
@@ -419,7 +433,7 @@ JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
     IfJsrtErrorSetGo(ChakraRTInterface::JsGetRuntime(currentContext, &runtime));
 
     if (fileName == nullptr)
-        {
+    {
         fileName = "script.js";
     }
 
@@ -432,7 +446,7 @@ JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
     // treated as a module source text instead of opening a new file.
     if (isSourceModule || (strcmp(scriptInjectType, "module") == 0))
     {
-        errorCode = LoadModuleFromString(fileName, fileContent, fullPath);
+        errorCode = LoadModuleFromString(fileName, fileContent, fullPath, isFile);
     }
     else if (strcmp(scriptInjectType, "self") == 0)
     {
@@ -1350,7 +1364,7 @@ bool WScriptJsrt::PrintException(LPCSTR fileName, JsErrorCode jsErrorCode)
 
                 int line;
                 int column;
-
+                
                 IfJsrtErrorFail(CreatePropertyIdFromString("line", &linePropertyId), false);
                 IfJsrtErrorFail(ChakraRTInterface::JsGetProperty(exception, linePropertyId, &lineProperty), false);
                 IfJsrtErrorFail(ChakraRTInterface::JsNumberToInt(lineProperty, &line), false);
@@ -1558,11 +1572,11 @@ HRESULT WScriptJsrt::ModuleMessage::Call(LPCSTR fileName)
                     fprintf(stderr, "Couldn't load file.\n");
                 }
 
-                LoadScript(nullptr, fullPath, nullptr, "module", true, WScriptJsrt::FinalizeFree);
+                LoadScript(nullptr, fullPath, nullptr, "module", true, WScriptJsrt::FinalizeFree, false);
             }
             else
             {
-                LoadScript(nullptr, fullPath, fileContent, "module", true, WScriptJsrt::FinalizeFree);
+                LoadScript(nullptr, fullPath, fileContent, "module", true, WScriptJsrt::FinalizeFree, true);
             }
         }
     }

bin/ch/WScriptJsrt.h

@@ -90,7 +90,7 @@ class WScriptJsrt
 #endif
 
     static bool PrintException(LPCSTR fileName, JsErrorCode jsErrorCode);
-    static JsValueRef LoadScript(JsValueRef callee, LPCSTR fileName, LPCSTR fileContent, LPCSTR scriptInjectType, bool isSourceModule, JsFinalizeCallback finalizeCallback);
+    static JsValueRef LoadScript(JsValueRef callee, LPCSTR fileName, LPCSTR fileContent, LPCSTR scriptInjectType, bool isSourceModule, JsFinalizeCallback finalizeCallback, bool isFile);
     static DWORD_PTR GetNextSourceContext();
     static JsValueRef LoadScriptFileHelper(JsValueRef callee, JsValueRef *arguments, unsigned short argumentCount, bool isSourceModule);
     static JsValueRef LoadScriptHelper(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState, bool isSourceModule);
@@ -114,7 +114,7 @@ class WScriptJsrt
     static JsValueRef CALLBACK RequestAsyncBreakCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
 
     static JsValueRef CALLBACK EmptyCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
-    static JsErrorCode CALLBACK LoadModuleFromString(LPCSTR fileName, LPCSTR fileContent, LPCSTR fullName = nullptr);
+    static JsErrorCode CALLBACK LoadModuleFromString(LPCSTR fileName, LPCSTR fileContent, LPCSTR fullName = nullptr, bool isFile = false);
     static JsErrorCode CALLBACK InitializeModuleInfo(JsValueRef specifier, JsModuleRecord moduleRecord);
 
     static JsValueRef CALLBACK LoadBinaryFileCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);

bin/ch/ch.cpp

@@ -10,6 +10,12 @@
 #include <fcntl.h>
 #endif
 
+#ifdef __linux__
+#include <sys/sysinfo.h>
+#elif defined(__APPLE__)
+#include <sys/sysctl.h>
+#endif
+
 unsigned int MessageBase::s_messageCount = 0;
 Debugger* Debugger::debugger = nullptr;
 
@@ -525,20 +531,52 @@ HRESULT RunScript(const char* fileName, LPCSTR fileContents, JsFinalizeCallback
 static HRESULT CreateRuntime(JsRuntimeHandle *runtime)
 {
     HRESULT hr = E_FAIL;
-    IfJsErrorFailLog(ChakraRTInterface::JsCreateRuntime(jsrtAttributes, nullptr, runtime));
 
 #ifndef _WIN32
-    // On Posix, malloc may not return NULL even if there is no
-    // memory left. However, kernel will send SIGKILL to process
-    // in case we use that `not actually available` memory address.
-    // (See posix man malloc and OOM)
-
+    // On Posix, malloc optimistically returns a non-null address without
+    // checking if it's actually able to back that allocation in memory
+    // Upon use of that address however, if the address space for that allocation
+    // can't be committed, the process is killed
+    // See the man page for malloc
+    //
+    // In order to avoid having to deal with this, we set the memory limit for the
+    // runtime to the size of the physical memory on the system
+    // TODO: 
+    // We could move the following into its own platform agnostic API
+    // but in this case, this is a one-time call thats not applicable
+    // on Windows so decided to leave as is
+    // Additionally, we can probably do better than just limit to the physical memory
+    // size
+
+#if defined(__APPLE__) || defined(__linux__)
     size_t memoryLimit;
-    if (PlatformAgnostic::SystemInfo::GetTotalRam(&memoryLimit))
+#ifdef __APPLE__
+    int totalRamHW[] = { CTL_HW, HW_MEMSIZE };
+    size_t length = sizeof(memoryLimit);
+    if (sysctl(totalRamHW, 2, &memoryLimit, &length, NULL, 0) == -1)
     {
-        IfJsErrorFailLog(ChakraRTInterface::JsSetRuntimeMemoryLimit(*runtime, memoryLimit));
+        memoryLimit = 0;
     }
+#else
+    struct sysinfo sysInfo;
+    if (sysinfo(&sysInfo) == -1)
+    {
+        memoryLimit = 0;
+    }
+    else
+    {
+        memoryLimit = sysInfo.totalram;
+    }
+#endif // __APPLE__
+#endif // __APPLE__ || __linux
+#endif // !_WIN32
+
+    IfJsErrorFailLog(ChakraRTInterface::JsCreateRuntime(jsrtAttributes, nullptr, runtime));
+
+#ifndef _WIN32
+    IfJsErrorFailLog(ChakraRTInterface::JsSetRuntimeMemoryLimit(*runtime, memoryLimit));
 #endif
+
     hr = S_OK;
 Error:
     return hr;

bin/rl/rl.cpp

@@ -367,6 +367,8 @@ unsigned NumberOfThreads = 0;
 TestList DirList, ExcludeDirList;
 BOOL FUserSpecifiedFiles = FALSE;
 BOOL FUserSpecifiedDirs = TRUE;
+BOOL FNoProgramOutput = FALSE;
+BOOL FOnlyAssertOutput = FALSE;
 BOOL FExcludeDirs = FALSE;
 BOOL FGenLst = FALSE;
 char *ResumeDir, *MatchDir;
@@ -2878,6 +2880,16 @@ ParseArg(
             break;
          }
 
+         if (!_stricmp(&arg[1], "noprogramoutput")) {
+            FNoProgramOutput = TRUE;
+            break;
+         }
+
+         if (!_stricmp(&arg[1], "onlyassertoutput")) {
+            FOnlyAssertOutput = TRUE;
+            break;
+         }
+
 #ifndef NODEBUG
          if (!_stricmp(&arg[1], "debug")) {
             FDebug = FVerbose = TRUE;

bin/rl/rl.h

@@ -870,6 +870,8 @@ extern BOOL FSyncEnumDirs;
 extern BOOL FNogpfnt;
 extern BOOL FTest;
 extern BOOL FAppendTestNameToExtraCCFlags;
+extern BOOL FNoProgramOutput;
+extern BOOL FOnlyAssertOutput;
 
 #define MAXOPTIONS 60
 extern const char *OptFlags[MAXOPTIONS + 1], *PogoOptFlags[MAXOPTIONS + 1];