[Merge chakra-core/ChakraCore@d234b08fd9] [MERGE #3904 @boingoing] St…

…rict mode global lambda functions should use LdThis instead of StrictLdThis Merge pull request #3904 from boingoing:LdThisForStrictLambda
nodejs · Oct 10, 2017 · adbea0f · adbea0f
1 parent 2ae996d
commit adbea0f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 2 deletions.
diff --git a/deps/chakrashim/core/lib/Runtime/ByteCode/ByteCodeEmitter.cpp b/deps/chakrashim/core/lib/Runtime/ByteCode/ByteCodeEmitter.cpp
@@ -2376,7 +2376,7 @@ void ByteCodeGenerator::GetEnclosingNonLambdaScope(FuncInfo *funcInfo, Scope * &
 
 void ByteCodeGenerator::EmitThis(FuncInfo *funcInfo, Js::RegSlot fromRegister)
 {
-    if (funcInfo->byteCodeFunction->GetIsStrictMode() && !funcInfo->IsGlobalFunction())
+    if (funcInfo->byteCodeFunction->GetIsStrictMode() && !funcInfo->IsGlobalFunction() && !funcInfo->IsLambda())
     {
         m_writer.Reg2(Js::OpCode::StrictLdThis, funcInfo->GetThisSymbol()->GetLocation(), fromRegister);
     }

diff --git a/deps/chakrashim/core/test/Basics/SpecialSymbolCapture.js b/deps/chakrashim/core/test/Basics/SpecialSymbolCapture.js
@@ -867,7 +867,23 @@ var tests = [
             }
             foo('arguments');
         }
-    }
+    },
+    {
+        name: "Global 'this' binding captured by strict-mode arrow",
+        body: function() {
+            WScript.LoadScript(`"use strict";
+                assert.areEqual(this, (() => this)(), "Lambda should load the global 'this' value itself via LdThis (not StrictLdThis)");
+            `);
+
+            WScript.LoadScript(`
+                assert.areEqual(this, (() => { "use strict"; return this; })(), "Lambda which has a 'use strict' clause inside");
+            `);
+
+            WScript.LoadScript(`"use strict";
+                assert.areEqual('object', typeof (() => this)(), "Verify lambda can load global 'this' value even if the global body itself does not have a 'this' binding");
+            `);
+        }
+    },
 ]
 
 testRunner.runTests(tests, { verbose: WScript.Arguments[0] != "summary" });