Fixed the use of outer scope 'this' in arrow functions. See dop251#334

arukiidou · Oct 11, 2021 · c357d26 · c357d26
1 parent bb5631b
commit c357d26
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 4 deletions.
diff --git a/compiler_expr.go b/compiler_expr.go
@@ -1320,13 +1320,11 @@ func (e *compiledThisExpr) emitGetter(putOnStack bool) {
 	if putOnStack {
 		e.addSrcMap()
 		scope := e.c.scope
-		for ; scope != nil && !scope.function && !scope.eval; scope = scope.outer {
+		for ; scope != nil && (scope.arrow || !scope.function && !scope.eval); scope = scope.outer {
 		}
 
 		if scope != nil {
-			if !scope.arrow {
-				scope.thisNeeded = true
-			}
+			scope.thisNeeded = true
 			e.c.emit(loadStack(0))
 		} else {
 			e.c.emit(loadGlobalObject)

diff --git a/compiler_test.go b/compiler_test.go
@@ -4148,6 +4148,19 @@ func TestArrowUseStrict(t *testing.T) {
 	}
 }
 
+func TestArrowBoxedThis(t *testing.T) {
+	const SCRIPT = `
+	var context;
+	fn = function() {
+		return (arg) => { var local; context = this; };
+	};
+	
+	fn()();
+	context === this;
+	`
+
+	testScript1(SCRIPT, valueTrue, t)
+}
 func TestParameterOverride(t *testing.T) {
 	const SCRIPT = `
 	function f(arg) {

diff --git a/tc39_test.go b/tc39_test.go
@@ -307,6 +307,7 @@ var (
 		"12.2.6.8",
 		"12.2.8",
 		"12.2.9",
+		"12.3.7",
 		"12.4",
 		"12.5",
 		"12.6",