Changeset 26621 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 15, 2007, 1:44:09 PM (18 years ago)

Author:

ggaren

Message:

JavaScriptCore:

Reviewed by Darin Adler.

Removed surprising self-named "hack" that made nested functions
available as named properties of their containing functions, and placed
containing function objects in the scope chains of nested functions.

There were a few reasons to remove this "hack:"

1. It contradicted FF, IE, and the ECMA spec.

2. It incurred a performance penalty, since merely parsing a function required parsing its body for nested functions (and so on).

3. SVN history contains no explanation for why it was added. It was just legacy code in a large merge a long, long time ago.

[ Patch broken off from ​http://bugs.webkit.org/show_bug.cgi?id=14868 ]

• kjs/nodes.cpp: (FuncDeclNode::processFuncDecl):

LayoutTests:

Reviewed by Darin Adler.

Removed surprising self-named "hack" that made nested functions
available as named properties of their containing functions, and placed
containing function objects in the scope chains of nested functions.

[ Patch broken off from ​http://bugs.webkit.org/show_bug.cgi?id=14868 ]

Changed this test to reflect correct behavior:

• fast/js/kde/function-expected.txt:
• fast/js/kde/resources/function.js: (Also removed tab characters.)

Added this test to flesh out the behavior more:

• fast/js/nested-function-scope-expected.txt: Added.
• fast/js/nested-function-scope.html: Added.

Location:

trunk/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• kjs/nodes.cpp (modified) (1 diff)

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2007-10-15  Geoffrey Garen  <[email protected]>
+
+        Reviewed by Darin Adler.
+        
+        Removed surprising self-named "hack" that made nested functions 
+        available as named properties of their containing functions, and placed
+        containing function objects in the scope chains of nested functions.
+        
+        There were a few reasons to remove this "hack:"
+
+        1. It contradicted FF, IE, and the ECMA spec.
+
+        2. It incurred a performance penalty, since merely parsing a function 
+        required parsing its body for nested functions (and so on).
+
+        3. SVN history contains no explanation for why it was added. It was just
+        legacy code in a large merge a long, long time ago.
+
+        [ Patch broken off from http://bugs.webkit.org/show_bug.cgi?id=14868 ]
+
+        * kjs/nodes.cpp:
+        (FuncDeclNode::processFuncDecl):
+
 2007-10-15  Geoffrey Garen  <[email protected]>
 

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -2487 +2487 @@
   // ECMA 10.2.2
   context->variableObject()->put(exec, ident, func, Internal | (context->codeType() == EvalCode ? 0 : DontDelete));
-
-  if (body) {
-    // hack the scope so that the function gets put as a property of func, and it's scope
-    // contains the func as well as our current scope
-    JSObject *oldVar = context->variableObject();
-    context->setVariableObject(func);
-    context->pushScope(func);
-    body->processFuncDecl(exec);
-    context->popScope();
-    context->setVariableObject(oldVar);
-  }
 }