Issue3257/3247/3306: Module import relative path

1) Change module imports (including dynamic imports) to be relative to the
source file that calls import (#3257)
2) Change to using full path as key for module record map (#3247)
3) A module can be evaluated after a 2nd request for module evaluation
is queued, therefore 2nd evaluation attempt should just return instead
of an error.
4) When dynamic import happens in the middle of module instantiation of
staticly imported modules, using the presence of promise to trigger
instantiation can be premature. Fix by going back to instantiate from
root module only. (#3306)
5) Remove canonicalization of file and path names by converting to lower
case because this is not UTF8 nor xplat friendly. Update baselines.

bin/ch/WScriptJsrt.cpp

@@ -37,6 +37,8 @@
 
 MessageQueue* WScriptJsrt::messageQueue = nullptr;
 std::map<std::string, JsModuleRecord>  WScriptJsrt::moduleRecordMap;
+std::map<JsModuleRecord, std::string>  WScriptJsrt::moduleDirMap;
+std::map<DWORD_PTR, std::string> WScriptJsrt::scriptDirMap;
 DWORD_PTR WScriptJsrt::sourceContext = 0;
 
 #define ERROR_MESSAGE_TO_STRING(errorCode, errorMessage, errorMessageString)        \
@@ -66,6 +68,12 @@ DWORD_PTR WScriptJsrt::GetNextSourceContext()
     return sourceContext++;
 }
 
+void WScriptJsrt::RegisterScriptDir(DWORD_PTR sourceContext, LPCSTR fullDirNarrow)
+{
+    char dir[_MAX_PATH];
+    scriptDirMap[sourceContext] = std::string(GetDir(fullDirNarrow, dir));
+}
+
 bool WScriptJsrt::CreateArgumentsObject(JsValueRef *argsObject)
 {
     LPWSTR *argv = HostConfigFlags::argsVal;
@@ -325,12 +333,22 @@ JsErrorCode WScriptJsrt::InitializeModuleInfo(JsValueRef specifier, JsModuleReco
     return JsNoError;
 }
 
-JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileContent)
+char* WScriptJsrt::GetDir(LPCSTR fullPathNarrow, __out_ecount(260) char* const fullDirNarrow)
+{
+    char dir[_MAX_DIR];
+    _splitpath_s(fullPathNarrow, fullDirNarrow, _MAX_DRIVE, dir, _MAX_DIR, nullptr, 0, nullptr, 0);
+    strcat_s(fullDirNarrow, _MAX_PATH, dir);
+    return fullDirNarrow;
+}
+
+JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileContent, LPCSTR fullName)
 {
     DWORD_PTR dwSourceCookie = WScriptJsrt::GetNextSourceContext();
     JsModuleRecord requestModule = JS_INVALID_REFERENCE;
-    auto moduleRecordEntry = moduleRecordMap.find(std::string(fileName));
+    LPCSTR moduleRecordKey = fullName ? fullName : fileName;
+    auto moduleRecordEntry = moduleRecordMap.find(std::string(moduleRecordKey));
     JsErrorCode errorCode = JsNoError;
+
     // we need to create a new moduleRecord if the specifier (fileName) is not found;
     // otherwise we'll use the old one.
     if (moduleRecordEntry == moduleRecordMap.end())
@@ -349,7 +367,13 @@ JsErrorCode WScriptJsrt::LoadModuleFromString(LPCSTR fileName, LPCSTR fileConten
         }
         if (errorCode == JsNoError)
         {
-            moduleRecordMap[std::string(fileName)] = requestModule;
+            if (fullName)
+            {
+                char dir[_MAX_PATH];
+                moduleDirMap[requestModule] = std::string(GetDir(fullName, dir));
+            }
+
+            moduleRecordMap[std::string(moduleRecordKey)] = requestModule;
         }
     }
     else
@@ -384,37 +408,26 @@ JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
     JsRuntimeHandle runtime = JS_INVALID_RUNTIME_HANDLE;
     void *callbackArg = (finalizeCallback != nullptr ? (void*)fileContent : nullptr);
 
-    char fullPathNarrow[_MAX_PATH];
-    size_t len = 0;
+    char fullPath[_MAX_PATH];
 
     IfJsrtErrorSetGo(ChakraRTInterface::JsGetCurrentContext(&currentContext));
     IfJsrtErrorSetGo(ChakraRTInterface::JsGetRuntime(currentContext, &runtime));
 
-    if (fileName)
+    if (fileName == nullptr)
     {
-        if (_fullpath(fullPathNarrow, fileName, _MAX_PATH) == nullptr)
-        {
-            IfFailGo(E_FAIL);
-        }
-        // canonicalize that path name to lower case for the profile storage
-        // REVIEW: This doesn't work for UTF8...
-        len = strlen(fullPathNarrow);
-        for (size_t i = 0; i < len; i++)
-        {
-            fullPathNarrow[i] = (char)tolower(fullPathNarrow[i]);
-        }
+        fileName = "script.js";
     }
-    else
+
+    if (_fullpath(fullPath, fileName, _MAX_PATH) == nullptr)
     {
-        // No fileName provided (WScript.LoadScript()), use dummy "script.js"
-        strcpy_s(fullPathNarrow, "script.js");
+        goto Error;
     }
 
     // this is called with LoadModuleCallback method as well where caller pass in a string that should be
     // treated as a module source text instead of opening a new file.
     if (isSourceModule || (strcmp(scriptInjectType, "module") == 0))
     {
-        errorCode = LoadModuleFromString(fileName, fileContent);
+        errorCode = LoadModuleFromString(fileName, fileContent, fullPath);
     }
     else if (strcmp(scriptInjectType, "self") == 0)
     {
@@ -427,9 +440,11 @@ JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
         IfJsrtErrorSetGo(ChakraRTInterface::JsCreateExternalArrayBuffer((void*)fileContent,
             (unsigned int)strlen(fileContent), finalizeCallback, callbackArg, &scriptSource));
         JsValueRef fname;
-        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateString(fullPathNarrow,
-            strlen(fullPathNarrow), &fname));
-        errorCode = ChakraRTInterface::JsRun(scriptSource, GetNextSourceContext(),
+        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateString(fullPath,
+            strlen(fullPath), &fname));
+        JsSourceContext sourceContext = GetNextSourceContext();
+        RegisterScriptDir(sourceContext, fullPath);
+        errorCode = ChakraRTInterface::JsRun(scriptSource, sourceContext,
             fname, JsParseScriptAttributeNone, &returnValue);
 
         if(errorCode == JsNoError)
@@ -462,9 +477,11 @@ JsValueRef WScriptJsrt::LoadScript(JsValueRef callee, LPCSTR fileName,
         IfJsrtErrorSetGo(ChakraRTInterface::JsCreateExternalArrayBuffer((void*)fileContent,
             (unsigned int)strlen(fileContent), finalizeCallback, callbackArg, &scriptSource));
         JsValueRef fname;
-        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateString(fullPathNarrow,
-            strlen(fullPathNarrow), &fname));
-        errorCode = ChakraRTInterface::JsRun(scriptSource, GetNextSourceContext(),
+        IfJsrtErrorSetGo(ChakraRTInterface::JsCreateString(fullPath,
+            strlen(fullPath), &fname));
+        JsSourceContext sourceContext = GetNextSourceContext();
+        RegisterScriptDir(sourceContext, fullPath);
+        errorCode = ChakraRTInterface::JsRun(scriptSource, sourceContext,
             fname, JsParseScriptAttributeNone, &returnValue);
 
         if (errorCode == JsNoError)
@@ -958,6 +975,8 @@ bool WScriptJsrt::Uninitialize()
     // "operator delete" / global HeapAllocator::Instance. Clear it manually here
     // to avoid worrying about global destructor order.
     moduleRecordMap.clear();
+    moduleDirMap.clear();
+    scriptDirMap.clear();
 
     auto& threadData = GetRuntimeThreadLocalData().threadData;
     if (threadData && !threadData->children.empty())
@@ -1487,10 +1506,28 @@ HRESULT WScriptJsrt::ModuleMessage::Call(LPCSTR fileName)
     {
         LPCSTR fileContent = nullptr;
         AutoString specifierStr(specifier);
+        char fullPath[_MAX_PATH];
         errorCode = specifierStr.GetError();
         if (errorCode == JsNoError)
         {
-            hr = Helpers::LoadScriptFromFile(specifierStr.GetString(), fileContent);
+            std::string specifierFullPath;
+            if (this->moduleRecord)
+            {
+                auto moduleDirEntry = moduleDirMap.find(this->moduleRecord);
+                if (moduleDirEntry != moduleDirMap.end())
+                {
+                    specifierFullPath = moduleDirEntry->second;
+                }
+            }
+            
+            specifierFullPath += *specifierStr;
+            if (_fullpath(fullPath, specifierFullPath.c_str(), _MAX_PATH) == nullptr)
+            {
+                return JsErrorInvalidArgument;
+            }
+
+            hr = Helpers::LoadScriptFromFile(fullPath, fileContent);
+
             if (FAILED(hr))
             {
                 if (!HostConfigFlags::flags.MuteHostErrorMsgIsEnabled)
@@ -1498,11 +1535,11 @@ HRESULT WScriptJsrt::ModuleMessage::Call(LPCSTR fileName)
                     fprintf(stderr, "Couldn't load file.\n");
                 }
 
-                LoadScript(nullptr, specifierStr.GetString(), nullptr, "module", true, WScriptJsrt::FinalizeFree);
+                LoadScript(nullptr, fullPath, nullptr, "module", true, WScriptJsrt::FinalizeFree);
             }
             else
             {
-                LoadScript(nullptr, specifierStr.GetString(), fileContent, "module", true, WScriptJsrt::FinalizeFree);
+                LoadScript(nullptr, fullPath, fileContent, "module", true, WScriptJsrt::FinalizeFree);
             }
         }
     }
@@ -1510,7 +1547,7 @@ HRESULT WScriptJsrt::ModuleMessage::Call(LPCSTR fileName)
 }
 
 JsErrorCode WScriptJsrt::FetchImportedModuleHelper(JsModuleRecord referencingModule,
-    JsValueRef specifier, __out JsModuleRecord* dependentModuleRecord)
+    JsValueRef specifier, __out JsModuleRecord* dependentModuleRecord, LPCSTR refdir)
 {
     JsModuleRecord moduleRecord = JS_INVALID_REFERENCE;
     AutoString specifierStr;
@@ -1520,7 +1557,16 @@ JsErrorCode WScriptJsrt::FetchImportedModuleHelper(JsModuleRecord referencingMod
     {
         return specifierStr.GetError();
     }
-    auto moduleEntry = moduleRecordMap.find(std::string(*specifierStr));
+
+    char fullPath[_MAX_PATH];
+    std::string specifierFullPath = refdir ? refdir : "";
+    specifierFullPath += *specifierStr;
+    if (_fullpath(fullPath, specifierFullPath.c_str(), _MAX_PATH) == nullptr)
+    {
+        return JsErrorInvalidArgument;
+    }
+
+    auto moduleEntry = moduleRecordMap.find(std::string(fullPath));
     if (moduleEntry != moduleRecordMap.end())
     {
         *dependentModuleRecord = moduleEntry->second;
@@ -1530,8 +1576,10 @@ JsErrorCode WScriptJsrt::FetchImportedModuleHelper(JsModuleRecord referencingMod
     JsErrorCode errorCode = ChakraRTInterface::JsInitializeModuleRecord(referencingModule, specifier, &moduleRecord);
     if (errorCode == JsNoError)
     {
+        char dir[_MAX_PATH];
+        moduleDirMap[moduleRecord] = std::string(GetDir(fullPath, dir));
         InitializeModuleInfo(specifier, moduleRecord);
-        moduleRecordMap[std::string(*specifierStr)] = moduleRecord;
+        moduleRecordMap[std::string(fullPath)] = moduleRecord;
         ModuleMessage* moduleMessage =
             WScriptJsrt::ModuleMessage::Create(referencingModule, specifier);
         if (moduleMessage == nullptr)
@@ -1551,6 +1599,13 @@ JsErrorCode WScriptJsrt::FetchImportedModuleHelper(JsModuleRecord referencingMod
 JsErrorCode WScriptJsrt::FetchImportedModule(_In_ JsModuleRecord referencingModule,
     _In_ JsValueRef specifier, _Outptr_result_maybenull_ JsModuleRecord* dependentModuleRecord)
 {
+    auto moduleDirEntry = moduleDirMap.find(referencingModule);
+    if (moduleDirEntry != moduleDirMap.end())
+    {
+        std::string dir = moduleDirEntry->second;
+        return FetchImportedModuleHelper(referencingModule, specifier, dependentModuleRecord, dir.c_str());
+    }
+
     return FetchImportedModuleHelper(referencingModule, specifier, dependentModuleRecord);
 }
 
@@ -1562,6 +1617,13 @@ JsErrorCode WScriptJsrt::FetchImportedModuleFromScript(_In_ JsSourceContext dwRe
     _In_ JsValueRef specifier, _Outptr_result_maybenull_ JsModuleRecord* dependentModuleRecord)
 {
     // ch.exe assumes all imported source files are located at .
+    auto scriptDirEntry = scriptDirMap.find(dwReferencingSourceContext);
+    if (scriptDirEntry != scriptDirMap.end())
+    {
+        std::string dir = scriptDirEntry->second;
+        return FetchImportedModuleHelper(nullptr, specifier, dependentModuleRecord, dir.c_str());
+    }
+
     return FetchImportedModuleHelper(nullptr, specifier, dependentModuleRecord);
 }
 

bin/ch/WScriptJsrt.h

@@ -96,9 +96,11 @@ public:
     static JsValueRef LoadScriptHelper(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState, bool isSourceModule);
     static bool InstallObjectsOnObject(JsValueRef object, const char* name, JsNativeFunction nativeFunction);
     static void FinalizeFree(void * addr);
+    static void RegisterScriptDir(DWORD_PTR sourceContext, LPCSTR fullDirNarrow);
 private:
     static bool CreateArgumentsObject(JsValueRef *argsObject);
     static bool CreateNamedFunction(const char*, JsNativeFunction callback, JsValueRef* functionVar);
+    static char* GetDir(LPCSTR fullPathNarrow, __out_ecount(260) char* const fullDirNarrow);
     static JsValueRef CALLBACK EchoCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
     static JsValueRef CALLBACK QuitCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
     static JsValueRef CALLBACK LoadScriptFileCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
@@ -112,7 +114,7 @@ private:
     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);
+    static JsErrorCode CALLBACK LoadModuleFromString(LPCSTR fileName, LPCSTR fileContent, LPCSTR fullName = nullptr);
     static JsErrorCode CALLBACK InitializeModuleInfo(JsValueRef specifier, JsModuleRecord moduleRecord);
 
     static JsValueRef CALLBACK LoadBinaryFileCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
@@ -126,9 +128,11 @@ private:
     static JsValueRef CALLBACK LeavingCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
     static JsValueRef CALLBACK SleepCallback(JsValueRef callee, bool isConstructCall, JsValueRef *arguments, unsigned short argumentCount, void *callbackState);
 
-    static JsErrorCode FetchImportedModuleHelper(JsModuleRecord referencingModule, JsValueRef specifier, __out JsModuleRecord* dependentModuleRecord);
+    static JsErrorCode FetchImportedModuleHelper(JsModuleRecord referencingModule, JsValueRef specifier, __out JsModuleRecord* dependentModuleRecord, LPCSTR refdir = nullptr);
 
     static MessageQueue *messageQueue;
     static DWORD_PTR sourceContext;
     static std::map<std::string, JsModuleRecord> moduleRecordMap;
+    static std::map<JsModuleRecord, std::string> moduleDirMap;
+    static std::map<DWORD_PTR, std::string> scriptDirMap;
 };

bin/ch/ch.cpp

@@ -447,8 +447,10 @@ HRESULT RunScript(const char* fileName, LPCSTR fileContents, JsFinalizeCallback
                 IfFailedReturn(ChakraRTInterface::JsTTDStart());
             }
 
+            auto sourceContext = WScriptJsrt::GetNextSourceContext();
+            WScriptJsrt::RegisterScriptDir(sourceContext, fullPath);
             runScript = ChakraRTInterface::JsRun(scriptSource,
-                WScriptJsrt::GetNextSourceContext(), fname,
+                sourceContext, fname,
                 JsParseScriptAttributeNone, nullptr /*result*/);
             if (runScript == JsErrorCategoryUsage)
             {
@@ -711,14 +713,7 @@ HRESULT ExecuteTest(const char* fileName)
             IfFailGo(E_FAIL);
         }
 
-        // canonicalize that path name to lower case for the profile storage
-        // REVIEW: Assuming no utf8 characters here
         len = strlen(fullPath);
-        for (size_t i = 0; i < len; i++)
-        {
-            fullPath[i] = (char)tolower(fullPath[i]);
-        }
-
         if (HostConfigFlags::flags.GenerateLibraryByteCodeHeaderIsEnabled)
         {
             if (HostConfigFlags::flags.GenerateLibraryByteCodeHeader != nullptr && *HostConfigFlags::flags.GenerateLibraryByteCodeHeader != _u('\0'))

lib/Jsrt/ChakraCommon.h

@@ -229,10 +229,6 @@ typedef unsigned short uint16_t;
         /// <summary>
         ///     Module was evaluated already when JsModuleEvaluation is called.
         /// </summary>
-        JsErrorModuleEvaluated,
-        /// <summary>
-        ///     Category of errors that relates to errors occurring within the engine itself.
-        /// </summary>
         JsErrorCategoryEngine = 0x20000,
         /// <summary>
         ///     The Chakra engine has run out of memory.

lib/Jsrt/Core/JsrtCore.cpp

@@ -110,10 +110,6 @@ JsModuleEvaluation(
         return JsErrorInvalidArgument;
     }
     Js::SourceTextModuleRecord* moduleRecord = Js::SourceTextModuleRecord::FromHost(requestModule);
-    if (moduleRecord->WasEvaluated())
-    {
-        return JsErrorModuleEvaluated;
-    }
     if (result != nullptr)
     {
         *result = JS_INVALID_REFERENCE;

lib/Runtime/Language/SourceTextModuleRecord.cpp

@@ -307,7 +307,7 @@ namespace Js
             OUTPUT_TRACE_DEBUGONLY(Js::ModulePhase, _u("\t>NotifyParentsAsNeeded\n"));
             NotifyParentsAsNeeded();
 
-            if (this->promise != nullptr || (!WasDeclarationInitialized() && isRootModule))
+            if (!WasDeclarationInitialized() && isRootModule)
             {
                 // TODO: move this as a promise call? if parser is called from a different thread
                 // We'll need to call the bytecode gen in the main thread as we are accessing GC.
@@ -850,7 +850,7 @@ namespace Js
             });
         }
 #endif
-        if (!scriptContext->GetConfig()->IsES6ModuleEnabled())
+        if (!scriptContext->GetConfig()->IsES6ModuleEnabled() || WasEvaluated())
         {
             return nullptr;
         }

test/Debugger/JsDiagGetFunctionPosition.js.dbg.baseline

@@ -2,7 +2,7 @@
   {
     "functionPosition": {
       "scriptId": 2,
-      "fileName": "jsdiaggetfunctionposition.js",
+      "fileName": "JsDiagGetFunctionPosition.js",
       "line": 8,
       "column": 1,
       "firstStatementLine": 8,
@@ -12,7 +12,7 @@
   {
     "functionPosition": {
       "scriptId": 2,
-      "fileName": "jsdiaggetfunctionposition.js",
+      "fileName": "JsDiagGetFunctionPosition.js",
       "line": 15,
       "column": 10,
       "firstStatementLine": 15,
@@ -22,7 +22,7 @@
   {
     "functionPosition": {
       "scriptId": 3,
-      "fileName": "dummyfilename.js",
+      "fileName": "dummyFileName.js",
       "line": 1,
       "column": 1,
       "firstStatementLine": 0,
@@ -44,7 +44,7 @@
   {
     "functionPosition": {
       "scriptId": 2,
-      "fileName": "jsdiaggetfunctionposition.js",
+      "fileName": "JsDiagGetFunctionPosition.js",
       "line": 27,
       "column": 34,
       "firstStatementLine": 28,

test/Debugger/JsDiagGetScripts.js.dbg.baseline

@@ -3,13 +3,13 @@
     "sources": [
       {
         "scriptId": 3,
-        "fileName": "dummyfilename.js",
+        "fileName": "dummyFileName.js",
         "lineCount": 1,
         "sourceLength": 0
       },
       {
         "scriptId": 2,
-        "fileName": "jsdiaggetscripts.js",
+        "fileName": "JsDiagGetScripts.js",
         "lineCount": 12,
         "sourceLength": 640
       },

test/DebuggerCommon/parentedDynamicCode2.js.dbg.baseline

@@ -3,7 +3,7 @@
     "sources": [
       {
         "scriptId": 1,
-        "fileName": "parenteddynamiccode2.js",
+        "fileName": "parentedDynamicCode2.js",
         "lineCount": 22,
         "sourceLength": 756
       },
@@ -27,7 +27,7 @@
     "sources": [
       {
         "scriptId": 1,
-        "fileName": "parenteddynamiccode2.js",
+        "fileName": "parentedDynamicCode2.js",
         "lineCount": 22,
         "sourceLength": 756
       },

test/DebuggerCommon/parentedDynamicCode3.js.dbg.baseline

@@ -8,7 +8,7 @@
     "sources": [
       {
         "scriptId": 1,
-        "fileName": "parenteddynamiccode3.js",
+        "fileName": "parentedDynamicCode3.js",
         "lineCount": 18,
         "sourceLength": 750
       },
@@ -37,7 +37,7 @@
     "sources": [
       {
         "scriptId": 1,
-        "fileName": "parenteddynamiccode3.js",
+        "fileName": "parentedDynamicCode3.js",
         "lineCount": 18,
         "sourceLength": 750
       },

test/Error/NativeErrors_v4.baseline

@@ -3,8 +3,8 @@ description    = (undefined)undefined
 number         = (undefined)undefined
 stack          = (string)  EvalError
    at eval code (eval code:1:1)
-   at Test(string) (nativeerrors.js:49:5)
-   at Global code (nativeerrors.js:68:1)
+   at Test(string) (NativeErrors.js:49:5)
+   at Global code (NativeErrors.js:68:1)
 toString()     = EvalError
 
 RangeError('This is a range error')
@@ -12,8 +12,8 @@ description    = (undefined)undefined
 number         = (undefined)undefined
 stack          = (string)  RangeError: This is a range error
    at eval code (eval code:1:1)
-   at Test(string) (nativeerrors.js:49:5)
-   at Global code (nativeerrors.js:69:1)
+   at Test(string) (NativeErrors.js:49:5)
+   at Global code (NativeErrors.js:69:1)
 toString()     = RangeError: This is a range error
 
 ReferenceError
@@ -21,8 +21,8 @@ description    = (undefined)undefined
 number         = (undefined)undefined
 stack          = (string)  ReferenceError
    at eval code (eval code:1:1)
-   at Test(string) (nativeerrors.js:49:5)
-   at Global code (nativeerrors.js:70:1)
+   at Test(string) (NativeErrors.js:49:5)
+   at Global code (NativeErrors.js:70:1)
 toString()     = ReferenceError
 
 SyntaxError
@@ -30,8 +30,8 @@ description    = (undefined)undefined
 number         = (undefined)undefined
 stack          = (string)  SyntaxError
    at eval code (eval code:1:1)
-   at Test(string) (nativeerrors.js:49:5)
-   at Global code (nativeerrors.js:71:1)
+   at Test(string) (NativeErrors.js:49:5)
+   at Global code (NativeErrors.js:71:1)
 toString()     = SyntaxError
 
 TypeError('This is a type error')
@@ -39,8 +39,8 @@ description    = (undefined)undefined
 number         = (undefined)undefined
 stack          = (string)  TypeError: This is a type error
    at eval code (eval code:1:1)
-   at Test(string) (nativeerrors.js:49:5)
-   at Global code (nativeerrors.js:72:1)
+   at Test(string) (NativeErrors.js:49:5)
+   at Global code (NativeErrors.js:72:1)
 toString()     = TypeError: This is a type error
 
 URIError
@@ -48,8 +48,8 @@ description    = (undefined)undefined
 number         = (undefined)undefined
 stack          = (string)  URIError
    at eval code (eval code:1:1)
-   at Test(string) (nativeerrors.js:49:5)
-   at Global code (nativeerrors.js:73:1)
+   at Test(string) (NativeErrors.js:49:5)
+   at Global code (NativeErrors.js:73:1)
 toString()     = URIError
 
 RegExpError

test/Error/PartInitStackFrame.baseline

@@ -1,3 +1,3 @@
 Error: Internal error
-	at foo (partinitstackframe.js:15:18)
-	at Global code (partinitstackframe.js:24:3)
+	at foo (PartInitStackFrame.js:15:18)
+	at Global code (PartInitStackFrame.js:24:3)

test/Error/errorCtor_v4.baseline

@@ -6,9 +6,9 @@ description  =             (string)
 number       = 0           (number)
 stack        = Error
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:75:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:75:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(NaN, NaN)
 message      = NaN         (string)
@@ -17,9 +17,9 @@ description  = NaN         (string)
 number       = NaN         (number)
 stack        = Error: NaN
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:78:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:78:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(1, 1)
 message      = 1           (string)
@@ -28,9 +28,9 @@ description  = 1           (string)
 number       = 1           (number)
 stack        = Error: 1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:79:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:79:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(1.1, 1.1)
 message      = 1.1         (string)
@@ -39,9 +39,9 @@ description  = 1.1         (string)
 number       = 1.1         (number)
 stack        = Error: 1.1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:80:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:80:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(undefined, undefined)
 message      =             (string)
@@ -50,9 +50,9 @@ description  = undefined   (string)
 number       = NaN         (number)
 stack        = Error
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:81:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:81:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(null, null)
 message      = null        (string)
@@ -61,9 +61,9 @@ description  = null        (string)
 number       = 0           (number)
 stack        = Error: null
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:82:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:82:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(true, true)
 message      = true        (string)
@@ -72,9 +72,9 @@ description  = true        (string)
 number       = 1           (number)
 stack        = Error: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:83:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:83:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(false, false)
 message      = false       (string)
@@ -83,9 +83,9 @@ description  = false       (string)
 number       = 0           (number)
 stack        = Error: false
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:84:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:84:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error('blah', 'blah')
 message      = blah        (string)
@@ -94,9 +94,9 @@ description  = blah        (string)
 number       = NaN         (number)
 stack        = Error: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:85:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:85:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new Object(), new Object())
 message      = [object Object](string)
@@ -105,9 +105,9 @@ description  = [object Object](string)
 number       = NaN         (number)
 stack        = Error: [object Object]
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:88:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:88:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new String('blah'), new String('blah'))
 message      = blah        (string)
@@ -116,9 +116,9 @@ description  = blah        (string)
 number       = NaN         (number)
 stack        = Error: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:89:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:89:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new Number(1.1), new Number(1.1))
 message      = 1.1         (string)
@@ -127,9 +127,9 @@ description  = 1.1         (string)
 number       = 1.1         (number)
 stack        = Error: 1.1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:90:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:90:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new Boolean(true), new Boolean(true))
 message      = true        (string)
@@ -138,9 +138,9 @@ description  = true        (string)
 number       = 1           (number)
 stack        = Error: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:91:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:91:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(Test, Test)
 message      = function Test(typename, s)
@@ -167,9 +167,9 @@ stack        = Error: function Test(typename, s)
     DumpObject(e);
 }
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:92:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:92:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(NaN)
 message      = NaN         (string)
@@ -178,9 +178,9 @@ description  = NaN         (string)
 number       = undefined   (undefined)
 stack        = Error: NaN
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:95:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:95:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(1)
 message      = 1           (string)
@@ -189,9 +189,9 @@ description  = 1           (string)
 number       = undefined   (undefined)
 stack        = Error: 1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:96:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:96:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(undefined)
 message      =             (string)
@@ -200,9 +200,9 @@ description  = undefined   (string)
 number       = undefined   (undefined)
 stack        = Error
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:97:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:97:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(null)
 message      = null        (string)
@@ -211,9 +211,9 @@ description  = null        (string)
 number       = undefined   (undefined)
 stack        = Error: null
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:98:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:98:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(true)
 message      = true        (string)
@@ -222,9 +222,9 @@ description  = true        (string)
 number       = undefined   (undefined)
 stack        = Error: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:99:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:99:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(false)
 message      = false       (string)
@@ -233,9 +233,9 @@ description  = false       (string)
 number       = undefined   (undefined)
 stack        = Error: false
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:100:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:100:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error('blah')
 message      = blah        (string)
@@ -244,9 +244,9 @@ description  = blah        (string)
 number       = undefined   (undefined)
 stack        = Error: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:101:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:101:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new Object())
 message      = [object Object](string)
@@ -255,9 +255,9 @@ description  = [object Object](string)
 number       = undefined   (undefined)
 stack        = Error: [object Object]
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:104:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:104:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new String('blah'))
 message      = blah        (string)
@@ -266,9 +266,9 @@ description  = blah        (string)
 number       = undefined   (undefined)
 stack        = Error: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:105:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:105:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new Number(1.1))
 message      = 1.1         (string)
@@ -277,9 +277,9 @@ description  = 1.1         (string)
 number       = undefined   (undefined)
 stack        = Error: 1.1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:106:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:106:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(new Boolean(1.1))
 message      = true        (string)
@@ -288,9 +288,9 @@ description  = true        (string)
 number       = undefined   (undefined)
 stack        = Error: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:107:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:107:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 Error(Test)
 message      = function Test(typename, s)
@@ -317,9 +317,9 @@ stack        = Error: function Test(typename, s)
     DumpObject(e);
 }
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:108:5)
-   at Global code (errorctor.js:111:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:108:5)
+   at Global code (errorCtor.js:111:1)(string)
 -----------------------------------------
 TypeError()
 message      =             (string)
@@ -328,9 +328,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:75:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:75:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(NaN, NaN)
 message      = NaN         (string)
@@ -339,9 +339,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: NaN
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:78:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:78:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(1, 1)
 message      = 1           (string)
@@ -350,9 +350,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: 1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:79:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:79:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(1.1, 1.1)
 message      = 1.1         (string)
@@ -361,9 +361,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: 1.1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:80:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:80:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(undefined, undefined)
 message      =             (string)
@@ -372,9 +372,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:81:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:81:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(null, null)
 message      = null        (string)
@@ -383,9 +383,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: null
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:82:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:82:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(true, true)
 message      = true        (string)
@@ -394,9 +394,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:83:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:83:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(false, false)
 message      = false       (string)
@@ -405,9 +405,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: false
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:84:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:84:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError('blah', 'blah')
 message      = blah        (string)
@@ -416,9 +416,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:85:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:85:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new Object(), new Object())
 message      = [object Object](string)
@@ -427,9 +427,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: [object Object]
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:88:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:88:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new String('blah'), new String('blah'))
 message      = blah        (string)
@@ -438,9 +438,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:89:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:89:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new Number(1.1), new Number(1.1))
 message      = 1.1         (string)
@@ -449,9 +449,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: 1.1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:90:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:90:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new Boolean(true), new Boolean(true))
 message      = true        (string)
@@ -460,9 +460,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:91:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:91:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(Test, Test)
 message      = function Test(typename, s)
@@ -483,9 +483,9 @@ stack        = TypeError: function Test(typename, s)
     DumpObject(e);
 }
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:92:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:92:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(NaN)
 message      = NaN         (string)
@@ -494,9 +494,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: NaN
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:95:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:95:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(1)
 message      = 1           (string)
@@ -505,9 +505,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: 1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:96:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:96:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(undefined)
 message      =             (string)
@@ -516,9 +516,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:97:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:97:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(null)
 message      = null        (string)
@@ -527,9 +527,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: null
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:98:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:98:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(true)
 message      = true        (string)
@@ -538,9 +538,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:99:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:99:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(false)
 message      = false       (string)
@@ -549,9 +549,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: false
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:100:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:100:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError('blah')
 message      = blah        (string)
@@ -560,9 +560,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:101:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:101:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new Object())
 message      = [object Object](string)
@@ -571,9 +571,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: [object Object]
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:104:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:104:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new String('blah'))
 message      = blah        (string)
@@ -582,9 +582,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: blah
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:105:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:105:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new Number(1.1))
 message      = 1.1         (string)
@@ -593,9 +593,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: 1.1
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:106:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:106:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(new Boolean(1.1))
 message      = true        (string)
@@ -604,9 +604,9 @@ description  = undefined   (undefined)
 number       = undefined   (undefined)
 stack        = TypeError: true
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:107:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:107:5)
+   at Global code (errorCtor.js:112:1)(string)
 -----------------------------------------
 TypeError(Test)
 message      = function Test(typename, s)
@@ -627,6 +627,6 @@ stack        = TypeError: function Test(typename, s)
     DumpObject(e);
 }
    at eval code (eval code:1:1)
-   at Test(string, string) (errorctor.js:68:5)
-   at TestCtor(string) (errorctor.js:108:5)
-   at Global code (errorctor.js:112:1)(string)
+   at Test(string, string) (errorCtor.js:68:5)
+   at TestCtor(string) (errorCtor.js:108:5)
+   at Global code (errorCtor.js:112:1)(string)

test/Error/errorProps_v4.baseline

@@ -33,7 +33,7 @@ new Error()
     name	  isOwn = false	 value = Error
     message	  isOwn = false	 value = 
     stack	  isOwn = true	 value = Error
-	at Global code (errorprops.js:55:1)
+	at Global code (errorProps.js:55:1)
     number	  isOwn = true	 value = 0
     description	  isOwn = true	 value = 
 
@@ -43,7 +43,7 @@ new Error(undefined)
     name	  isOwn = false	 value = Error
     message	  isOwn = false	 value = 
     stack	  isOwn = true	 value = Error
-	at Global code (errorprops.js:59:1)
+	at Global code (errorProps.js:59:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = true	 value = undefined
 
@@ -53,7 +53,7 @@ new Error(null)
     name	  isOwn = false	 value = Error
     message	  isOwn = true	 value = null
     stack	  isOwn = true	 value = Error: null
-	at Global code (errorprops.js:63:1)
+	at Global code (errorProps.js:63:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = true	 value = null
 
@@ -63,7 +63,7 @@ new Error("Hello")
     name	  isOwn = false	 value = Error
     message	  isOwn = true	 value = Hello
     stack	  isOwn = true	 value = Error: Hello
-	at Global code (errorprops.js:67:1)
+	at Global code (errorProps.js:67:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = true	 value = Hello
 
@@ -73,7 +73,7 @@ new Error(100, "With a number")
     name	  isOwn = false	 value = Error
     message	  isOwn = true	 value = With a number
     stack	  isOwn = true	 value = Error: With a number
-	at Global code (errorprops.js:71:1)
+	at Global code (errorProps.js:71:1)
     number	  isOwn = true	 value = 100
     description	  isOwn = true	 value = With a number
 
@@ -83,7 +83,7 @@ new Error("Hello"); name=undefined
     name	  isOwn = true	 value = undefined
     message	  isOwn = true	 value = Hello
     stack	  isOwn = true	 value = Error: Hello
-	at Global code (errorprops.js:75:1)
+	at Global code (errorProps.js:75:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = true	 value = Hello
     name	  isOwn = true	 value = undefined
@@ -94,7 +94,7 @@ new ReferenceError("I'm a reference error")
     name	  isOwn = false	 value = ReferenceError
     message	  isOwn = true	 value = I'm a reference error
     stack	  isOwn = true	 value = ReferenceError: I'm a reference error
-	at Global code (errorprops.js:80:1)
+	at Global code (errorProps.js:80:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = false	 value = undefined
 ReferenceError: 'RegExpError' is not defined
@@ -105,7 +105,7 @@ new TypeError()
     name	  isOwn = false	 value = TypeError
     message	  isOwn = false	 value = 
     stack	  isOwn = true	 value = TypeError
-	at Global code (errorprops.js:90:1)
+	at Global code (errorProps.js:90:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = false	 value = undefined
 
@@ -115,7 +115,7 @@ new TypeError(undefined)
     name	  isOwn = false	 value = TypeError
     message	  isOwn = false	 value = 
     stack	  isOwn = true	 value = TypeError
-	at Global code (errorprops.js:94:1)
+	at Global code (errorProps.js:94:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = false	 value = undefined
 
@@ -125,7 +125,7 @@ new TypeError(null)
     name	  isOwn = false	 value = TypeError
     message	  isOwn = true	 value = null
     stack	  isOwn = true	 value = TypeError: null
-	at Global code (errorprops.js:98:1)
+	at Global code (errorProps.js:98:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = false	 value = undefined
 
@@ -135,7 +135,7 @@ new TypeError("With a undef name")
     name	  isOwn = true	 value = undefined
     message	  isOwn = true	 value = With a undef name
     stack	  isOwn = true	 value = Error: With a undef name
-	at Global code (errorprops.js:103:1)
+	at Global code (errorProps.js:103:1)
     number	  isOwn = false	 value = undefined
     description	  isOwn = false	 value = undefined
     name	  isOwn = true	 value = undefined
@@ -146,6 +146,6 @@ Runtime TypeError()
     name	  isOwn = false	 value = ReferenceError
     message	  isOwn = true	 value = 'boo' is not defined
     stack	  isOwn = true	 value = ReferenceError: 'boo' is not defined
-	at Global code (errorprops.js:111:5)
+	at Global code (errorProps.js:111:5)
     number	  isOwn = true	 value = -2146823279
     description	  isOwn = true	 value = 'boo' is not defined

test/Error/inlineSameFunc.baseline

@@ -1,5 +1,5 @@
 Error: abc
-	at f (inlinesamefunc.js:11:5)
-	at f (inlinesamefunc.js:13:5)
-	at f (inlinesamefunc.js:13:5)
-	at Global code (inlinesamefunc.js:19:4)
+	at f (inlineSameFunc.js:11:5)
+	at f (inlineSameFunc.js:13:5)
+	at f (inlineSameFunc.js:13:5)
+	at Global code (inlineSameFunc.js:19:4)

test/Intl/IntlInternalsHiddenFromExceptionStackTest.baseline

@@ -1,6 +1,6 @@
 Error: Throwing...
-   at toString (intlinternalshiddenfromexceptionstacktest.js:15:17)
+   at toString (IntlInternalsHiddenFromExceptionStackTest.js:15:17)
    at Intl.Collator.prototype.compare (native code)
    at Array.prototype.sort (native code)
-   at testCallback (intlinternalshiddenfromexceptionstacktest.js:22:5)
-   at Global code (intlinternalshiddenfromexceptionstacktest.js:26:5)
+   at testCallback (IntlInternalsHiddenFromExceptionStackTest.js:22:5)
+   at Global code (IntlInternalsHiddenFromExceptionStackTest.js:26:5)

test/Intl/IntlInternalsHiddenFromFirstChanceExceptionStackTest.baseline

@@ -1,3 +1,3 @@
 RangeError: Locale 'INVALID CURRENCY CODE' is not well-formed
-   at testFirstChanceException (intlinternalshiddenfromfirstchanceexceptionstacktest.js:10:5)
-   at Global code (intlinternalshiddenfromfirstchanceexceptionstacktest.js:14:5)
+   at testFirstChanceException (IntlInternalsHiddenFromFirstChanceExceptionStackTest.js:10:5)
+   at Global code (IntlInternalsHiddenFromFirstChanceExceptionStackTest.js:14:5)

test/Miscellaneous/SetTimeout.baseline

@@ -1,3 +1,3 @@
 OK
 TypeError: Unable to get property 'an' of undefined or null reference
-	at Anonymous function() (settimeout.js:10:5)
+	at Anonymous function() (SetTimeout.js:10:5)

test/Object/forIn.error.baseline

@@ -1,3 +1,3 @@
 ReferenceError: 'c' is not defined
-	at foo (forin.error.js:10:5)
-	at Global code (forin.error.js:18:3)
+	at foo (forIn.error.js:10:5)
+	at Global code (forIn.error.js:18:3)

test/StackTrace/ErrorPrototype.baseline

@@ -1,66 +1,66 @@
 Prototype is new Error()
 Error: Prototype is new Error()
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:41:5)
-   at runtest (errorprototype.js:46:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:41:5)
+   at runtest (ErrorPrototype.js:46:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype has new Error()
 Error: Prototype has new Error()
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:42:5)
-   at runtest (errorprototype.js:46:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:42:5)
+   at runtest (ErrorPrototype.js:46:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype is Error.prototype
 Error: Prototype is Error.prototype
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:41:5)
-   at runtest (errorprototype.js:47:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:41:5)
+   at runtest (ErrorPrototype.js:47:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype has Error.prototype
 Error: Prototype has Error.prototype
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:42:5)
-   at runtest (errorprototype.js:47:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:42:5)
+   at runtest (ErrorPrototype.js:47:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype is new RangeError()
 RangeError: Prototype is new RangeError()
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:41:5)
-   at runtest (errorprototype.js:48:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:41:5)
+   at runtest (ErrorPrototype.js:48:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype has new RangeError()
 RangeError: Prototype has new RangeError()
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:42:5)
-   at runtest (errorprototype.js:48:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:42:5)
+   at runtest (ErrorPrototype.js:48:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype is RangeError.prototype
 RangeError: Prototype is RangeError.prototype
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:41:5)
-   at runtest (errorprototype.js:49:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:41:5)
+   at runtest (ErrorPrototype.js:49:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype has RangeError.prototype
 RangeError: Prototype has RangeError.prototype
-   at testErrorStack (errorprototype.js:21:9)
-   at testErrorPrototype (errorprototype.js:34:5)
-   at testErrorPrototypeChain (errorprototype.js:42:5)
-   at runtest (errorprototype.js:49:5)
-   at Global code (errorprototype.js:62:1)
+   at testErrorStack (ErrorPrototype.js:21:9)
+   at testErrorPrototype (ErrorPrototype.js:34:5)
+   at testErrorPrototypeChain (ErrorPrototype.js:42:5)
+   at runtest (ErrorPrototype.js:49:5)
+   at Global code (ErrorPrototype.js:62:1)
 
 Prototype is 123
 undefined

test/StackTrace/FunctionName.js.baseline

@@ -1,8 +1,8 @@
 Error: My Error!
-   at foo (functionname.js:24:9)
-   at func (functionname.js:28:9)
+   at foo (FunctionName.js:24:9)
+   at func (FunctionName.js:28:9)
    at Function code (Function code:1:4)
    at eval code (eval code:1:1)
-   at Anonymous function (functionname.js:35:13)
-   at bar (functionname.js:34:10)
-   at Global code (functionname.js:39:5)
+   at Anonymous function (FunctionName.js:35:13)
+   at bar (FunctionName.js:34:10)
+   at Global code (FunctionName.js:39:5)

test/StackTrace/LongCallStackThrow.js.Args30.baseline

@@ -1,11 +1,11 @@
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)

test/StackTrace/LongCallStackThrow.js.Args5.baseline

@@ -1,10 +1,10 @@
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
-   at Global code (longcallstackthrow.js:63:9)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)
+   at Global code (LongCallStackThrow.js:63:9)

test/StackTrace/LongCallStackThrow.js.Args6.baseline

@@ -1,11 +1,11 @@
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
-   at Global code (longcallstackthrow.js:63:9)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)
+   at Global code (LongCallStackThrow.js:63:9)

test/StackTrace/LongCallStackThrow.js.Args7.baseline

@@ -1,11 +1,11 @@
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)

test/StackTrace/PropertyValidation.nostrict.baseline

@@ -2,10 +2,10 @@ Properties of e:
 
 e.number: -2146823279
 e.stack: ReferenceError: 'BadType' is not defined
-   at throwException (propertyvalidation.js:65:9)
-   at bar (propertyvalidation.js:85:5)
-   at foo (propertyvalidation.js:90:5)
-   at Global code (propertyvalidation.js:93:1)
+   at throwException (PropertyValidation.js:65:9)
+   at bar (PropertyValidation.js:85:5)
+   at foo (PropertyValidation.js:90:5)
+   at Global code (PropertyValidation.js:93:1)
 
 
 Deleting e.stack ...
@@ -16,10 +16,10 @@ Properties of e:
 
 e.number: -2146823279
 e.stack: ReferenceError: 'BadType' is not defined
-   at throwException (propertyvalidation.js:74:9)
-   at bar (propertyvalidation.js:85:5)
-   at foo (propertyvalidation.js:90:5)
-   at Global code (propertyvalidation.js:93:1)
+   at throwException (PropertyValidation.js:74:9)
+   at bar (PropertyValidation.js:85:5)
+   at foo (PropertyValidation.js:90:5)
+   at Global code (PropertyValidation.js:93:1)
 
 
 Updating e.stack ...

test/StackTrace/SimpleThrow.js.baseline

@@ -1,21 +1,21 @@
 ReferenceError: 'BadType' is not defined
-   at throwException (simplethrow.js:22:9)
-   at bar (simplethrow.js:69:5)
-   at foo (simplethrow.js:76:5)
-   at runtest (simplethrow.js:81:5)
-   at Global code (simplethrow.js:88:9)
+   at throwException (SimpleThrow.js:22:9)
+   at bar (SimpleThrow.js:69:5)
+   at foo (SimpleThrow.js:76:5)
+   at runtest (SimpleThrow.js:81:5)
+   at Global code (SimpleThrow.js:88:9)
 
 ReferenceError: 'BadTypeWithFinally' is not defined
-   at throwExceptionWithFinally (simplethrow.js:35:9)
-   at bar (simplethrow.js:70:5)
-   at foo (simplethrow.js:76:5)
-   at runtest (simplethrow.js:81:5)
-   at Global code (simplethrow.js:88:9)
+   at throwExceptionWithFinally (SimpleThrow.js:35:9)
+   at bar (SimpleThrow.js:70:5)
+   at foo (SimpleThrow.js:76:5)
+   at runtest (SimpleThrow.js:81:5)
+   at Global code (SimpleThrow.js:88:9)
 
 TypeError: Unable to set property 'nonExistentProperty' of undefined or null reference
-   at StricModeFunction (simplethrow.js:60:5)
-   at throwExceptionLineNumber (simplethrow.js:49:9)
-   at bar (simplethrow.js:71:5)
-   at foo (simplethrow.js:76:5)
-   at runtest (simplethrow.js:81:5)
-   at Global code (simplethrow.js:88:9)
+   at StricModeFunction (SimpleThrow.js:60:5)
+   at throwExceptionLineNumber (SimpleThrow.js:49:9)
+   at bar (SimpleThrow.js:71:5)
+   at foo (SimpleThrow.js:76:5)
+   at runtest (SimpleThrow.js:81:5)
+   at Global code (SimpleThrow.js:88:9)

test/StackTrace/StackTraceLimit.baseline

@@ -6,210 +6,210 @@ configurable: true
 
 -- Error.stackTraceLimit: 10
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
 
 -- Error.stackTraceLimit: 4
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
 
 -- Error.stackTraceLimit: Infinity
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
-   at testLongCallStack (stacktracelimit.js:23:5)
-   at Global code (stacktracelimit.js:29:1)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)
+   at testLongCallStack (StackTraceLimit.js:23:5)
+   at Global code (StackTraceLimit.js:29:1)
 
 -- Error.stackTraceLimit: 1
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
+   at throwException (LongCallStackThrow.js:34:5)
 
 -- Error.stackTraceLimit: 20
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
 
 -- Error.stackTraceLimit: 5.1
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
 
 -- Error.stackTraceLimit: -1
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
-   at testLongCallStack (stacktracelimit.js:23:5)
-   at Global code (stacktracelimit.js:33:1)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)
+   at testLongCallStack (StackTraceLimit.js:23:5)
+   at Global code (StackTraceLimit.js:33:1)
 
 -- Error.stackTraceLimit: -3.2
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
-   at testLongCallStack (stacktracelimit.js:23:5)
-   at Global code (stacktracelimit.js:34:1)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)
+   at testLongCallStack (StackTraceLimit.js:23:5)
+   at Global code (StackTraceLimit.js:34:1)
 
 -- Error.stackTraceLimit: -Infinity
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
-   at testLongCallStack (stacktracelimit.js:23:5)
-   at Global code (stacktracelimit.js:35:1)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)
+   at testLongCallStack (StackTraceLimit.js:23:5)
+   at Global code (StackTraceLimit.js:35:1)
 
 -- Error.stackTraceLimit: 0
 Error: this is my error
@@ -235,9 +235,9 @@ Error: this is my error
 ** Custom stackTraceLimit getter Called, return 3
 ** Custom stackTraceLimit getter Called, return 3
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
 
 --Delete it
 -- Error.stackTraceLimit: undefined
@@ -246,17 +246,17 @@ Error: this is my error
 --Available on prototype
 -- Error.stackTraceLimit: 2
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
 
 --Set to data property again
 -- Error.stackTraceLimit: 5
 Error: this is my error
-   at throwException (longcallstackthrow.js:34:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
+   at throwException (LongCallStackThrow.js:34:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
 
 --Throw in getter
 ** Custom stackTraceLimit getter Called, throw
@@ -267,45 +267,45 @@ Error: Out of stack space
 
 --Throw new Error() in getter for a number of times
 Error: My error in custom stackTraceLimit getter
-   at stackTraceLimit.get (stacktracelimit.js:94:13)
-   at stackTraceLimit.get (stacktracelimit.js:94:13)
-   at stackTraceLimit.get (stacktracelimit.js:94:13)
-   at stackTraceLimit.get (stacktracelimit.js:94:13)
-   at throwException (longcallstackthrow.js:33:5)
-   at throwExceptionWithCatch (longcallstackthrow.js:22:9)
-   at Anonymous function (longcallstackthrow.js:45:17)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at Anonymous function (longcallstackthrow.js:47:13)
-   at runtest (longcallstackthrow.js:56:5)
-   at testLongCallStack (stacktracelimit.js:23:5)
-   at Global code (stacktracelimit.js:101:1)
+   at stackTraceLimit.get (StackTraceLimit.js:94:13)
+   at stackTraceLimit.get (StackTraceLimit.js:94:13)
+   at stackTraceLimit.get (StackTraceLimit.js:94:13)
+   at stackTraceLimit.get (StackTraceLimit.js:94:13)
+   at throwException (LongCallStackThrow.js:33:5)
+   at throwExceptionWithCatch (LongCallStackThrow.js:22:9)
+   at Anonymous function (LongCallStackThrow.js:45:17)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at Anonymous function (LongCallStackThrow.js:47:13)
+   at runtest (LongCallStackThrow.js:56:5)
+   at testLongCallStack (StackTraceLimit.js:23:5)
+   at Global code (StackTraceLimit.js:101:1)
 
 -- Error.stackTraceLimit: null
 Error: this is my error

test/StackTrace/StackTraceLimitOOS.baseline

@@ -1,23 +1,23 @@
 Error.stackTraceLimit: Infinity
 Error: Out of stack space
    ...
-   at bar (stacktracelimitoos.js:82:9)
-   at foo (stacktracelimitoos.js:79:9)
-   at bar (stacktracelimitoos.js:82:9)
-   at foo (stacktracelimitoos.js:79:9)
-   at bar (stacktracelimitoos.js:82:9)
-   at foo (stacktracelimitoos.js:79:9)
-   at bar (stacktracelimitoos.js:82:9)
-   at foo (stacktracelimitoos.js:79:9)
-   at bar (stacktracelimitoos.js:82:9)
-   at foo (stacktracelimitoos.js:79:9)
-   at bar (stacktracelimitoos.js:82:9)
-   at foo (stacktracelimitoos.js:79:9)
-   at bar (stacktracelimitoos.js:82:9)
-   at foo (stacktracelimitoos.js:79:9)
-   at throwException (stacktracelimitoos.js:84:5)
-   at throwExceptionWithCatch (stacktracelimitoos.js:68:9)
-   at runtest (stacktracelimitoos.js:89:5)
-   at capture (stacktracelimitoos.js:42:13)
-   at Global code (stacktracelimitoos.js:98:1)
+   at bar (StackTraceLimitOOS.js:82:9)
+   at foo (StackTraceLimitOOS.js:79:9)
+   at bar (StackTraceLimitOOS.js:82:9)
+   at foo (StackTraceLimitOOS.js:79:9)
+   at bar (StackTraceLimitOOS.js:82:9)
+   at foo (StackTraceLimitOOS.js:79:9)
+   at bar (StackTraceLimitOOS.js:82:9)
+   at foo (StackTraceLimitOOS.js:79:9)
+   at bar (StackTraceLimitOOS.js:82:9)
+   at foo (StackTraceLimitOOS.js:79:9)
+   at bar (StackTraceLimitOOS.js:82:9)
+   at foo (StackTraceLimitOOS.js:79:9)
+   at bar (StackTraceLimitOOS.js:82:9)
+   at foo (StackTraceLimitOOS.js:79:9)
+   at throwException (StackTraceLimitOOS.js:84:5)
+   at throwExceptionWithCatch (StackTraceLimitOOS.js:68:9)
+   at runtest (StackTraceLimitOOS.js:89:5)
+   at capture (StackTraceLimitOOS.js:42:13)
+   at Global code (StackTraceLimitOOS.js:98:1)
 

test/StackTrace/x64StackWalk.baseline

@@ -1,18 +1,18 @@
 ReferenceError: 'baz' is not defined
-   at foo (x64stackwalk.js:13:9)
-   at Global code (x64stackwalk.js:23:1)
+   at foo (x64StackWalk.js:13:9)
+   at Global code (x64StackWalk.js:23:1)
 ReferenceError: 'baz' is not defined
-   at foo (x64stackwalk.js:18:9)
-   at Global code (x64stackwalk.js:23:1)
+   at foo (x64StackWalk.js:18:9)
+   at Global code (x64StackWalk.js:23:1)
 ReferenceError: 'baz' is not defined
-   at foo (x64stackwalk.js:13:9)
-   at Global code (x64stackwalk.js:24:1)
+   at foo (x64StackWalk.js:13:9)
+   at Global code (x64StackWalk.js:24:1)
 ReferenceError: 'baz' is not defined
-   at foo (x64stackwalk.js:18:9)
-   at Global code (x64stackwalk.js:24:1)
+   at foo (x64StackWalk.js:18:9)
+   at Global code (x64StackWalk.js:24:1)
 ReferenceError: 'baz' is not defined
-   at foo (x64stackwalk.js:13:9)
-   at Global code (x64stackwalk.js:25:1)
+   at foo (x64StackWalk.js:13:9)
+   at Global code (x64StackWalk.js:25:1)
 ReferenceError: 'baz' is not defined
-   at foo (x64stackwalk.js:18:9)
-   at Global code (x64stackwalk.js:25:1)
+   at foo (x64StackWalk.js:18:9)
+   at Global code (x64StackWalk.js:25:1)

test/StackTrace/x64StackWalkLoopBody.baseline

@@ -1,48 +1,48 @@
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)
 ReferenceError: 'baz' is not defined
-   at bar (x64stackwalkloopbody.js:18:17)
-   at Global code (x64stackwalkloopbody.js:27:1)
+   at bar (x64StackWalkLoopBody.js:18:17)
+   at Global code (x64StackWalkLoopBody.js:27:1)

test/es6/bug_issue_3247.baseline

@@ -0,0 +1 @@
+eval

test/es6/bug_issue_3247.js

@@ -0,0 +1,6 @@
+//-------------------------------------------------------------------------------------------------------
+// Copyright (C) Microsoft. All rights reserved.
+// Licensed under the MIT license. See LICENSE.txt file in the project root for full license information.
+//-------------------------------------------------------------------------------------------------------
+
+WScript.LoadModule(`import "bug_issue_3247_dep.js"`);

test/es6/bug_issue_3247_dep.js

@@ -0,0 +1,7 @@
+//-------------------------------------------------------------------------------------------------------
+// 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_3247_dep.js';
+print('eval');

test/es6/bug_issue_3257.baseline

@@ -0,0 +1,4 @@
+script0
+mod2
+mod1
+mod0

test/es6/bug_issue_3257.js

@@ -0,0 +1,7 @@
+//-------------------------------------------------------------------------------------------------------
+// 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

@@ -0,0 +1,9 @@
+//-------------------------------------------------------------------------------------------------------
+// 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

@@ -0,0 +1,7 @@
+//-------------------------------------------------------------------------------------------------------
+// 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

@@ -0,0 +1,7 @@
+//-------------------------------------------------------------------------------------------------------
+// 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

@@ -0,0 +1,8 @@
+//-------------------------------------------------------------------------------------------------------
+// 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

@@ -1423,6 +1423,20 @@
     <tags>BugFix,exclude_sanitize_address</tags>
   </default>
 </test>
+<test>
+  <default>
+    <files>bug_issue_3247.js</files>
+    <baseline>bug_issue_3247.baseline</baseline>
+    <tags>BugFix,exclude_sanitize_address</tags>
+  </default>
+</test>
+<test>
+  <default>
+    <files>bug_issue_3257.js</files>
+    <baseline>bug_issue_3257.baseline</baseline>
+    <tags>BugFix,exclude_sanitize_address</tags>
+  </default>
+</test>
 <test>
   <default>
     <files>typedarray_bugs.js</files>

test/inlining/polyInliningFixedMethods.baseline

@@ -8,6 +8,6 @@ b1
 f
 f
 TypeError: Unable to get property 'method0' of undefined or null reference
-   at v15 (polyinliningfixedmethods.js:94:7)
-   at func3 (polyinliningfixedmethods.js:99:3)
-   at Global code (polyinliningfixedmethods.js:104:3)
+   at v15 (polyInliningFixedMethods.js:94:7)
+   at func3 (polyInliningFixedMethods.js:99:3)
+   at Global code (polyInliningFixedMethods.js:104:3)

test/inlining/stackTrace.baseline

@@ -1,5 +1,5 @@
 ReferenceError: 'argMath5' is not defined
-   at func0 (stacktrace.js:31:7)
-   at func4 (stacktrace.js:27:5)
-   at test0 (stacktrace.js:39:3)
-   at Global code (stacktrace.js:43:3)
+   at func0 (stackTrace.js:31:7)
+   at func4 (stackTrace.js:27:5)
+   at test0 (stackTrace.js:39:3)
+   at Global code (stackTrace.js:43:3)