Changeset 127810 in webkit for trunk/Source/JavaScriptCore/runtime/JSNameScope.h

Timestamp:

Sep 6, 2012, 6:42:53 PM (13 years ago)

Author:

[email protected]

Message:

Source/JavaScriptCore: Rolled back in <​http://trac.webkit.org/changeset/127698> with a fix for
fast/dom/HTMLScriptElement/script-reexecution-pretty-diff.html, which
is to make sure that function declarations don't put their names in scope.

Reviewed by Gavin Barraclough.

Named functions should not allocate scope objects for their names
​https://bugs.webkit.org/show_bug.cgi?id=95659

Reviewed by Oliver Hunt.

LayoutTests: Rolled back in <​http://trac.webkit.org/changeset/127698> with a fix for
fast/dom/HTMLScriptElement/script-reexecution-pretty-diff.html.

Added a more explicit test for the feature I broke in
fast/dom/HTMLScriptElement/script-reexecution-pretty-diff.html.

Reviewed by Gavin Barraclough.

Named functions should not allocate scope objects for their names
​https://bugs.webkit.org/show_bug.cgi?id=95659

Reviewed by Oliver Hunt.

• fast/dom/HTMLScriptElement/script-reexecution.html:
• fast/js/function-name-is-in-scope-expected.txt: Added.
• fast/js/function-name-is-in-scope.html: Added.

File:

• trunk/Source/JavaScriptCore/runtime/JSNameScope.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/runtime/JSNameScope.h

@@ -39 +39 @@
     static JSNameScope* create(ExecState* exec, const Identifier& identifier, JSValue value, unsigned attributes)
     {
-        JSNameScope* scopeObject = new (NotNull, allocateCell<JSNameScope>(*exec->heap())) JSNameScope(exec);
+        JSNameScope* scopeObject = new (NotNull, allocateCell<JSNameScope>(*exec->heap())) JSNameScope(exec, exec->scope());
+        scopeObject->finishCreation(exec, identifier, value, attributes);
+        return scopeObject;
+    }
+
+    static JSNameScope* create(ExecState* exec, const Identifier& identifier, JSValue value, unsigned attributes, JSScope* next)
+    {
+        JSNameScope* scopeObject = new (NotNull, allocateCell<JSNameScope>(*exec->heap())) JSNameScope(exec, next);
         scopeObject->finishCreation(exec, identifier, value, attributes);
         return scopeObject;
@@ -65 +72 @@
 
 private:
-    JSNameScope(ExecState* exec)
+    JSNameScope(ExecState* exec, JSScope* next)
         : Base(
             exec->globalData(),
             exec->lexicalGlobalObject()->nameScopeStructure(),
             reinterpret_cast<Register*>(&m_registerStore + 1),
-            exec->scope()
+            next
         )
     {