Changeset 197094 in webkit

Timestamp:

Feb 25, 2016, 3:08:42 AM (11 years ago)

Author:

Carlos Garcia Campos

Message:

Merge r196948 - [JSC shell] Don't put empty arguments array to VM.
​https://bugs.webkit.org/show_bug.cgi?id=154516

Patch by Konstantin Tokarev <Konstantin Tokarev> on 2016-02-22
Reviewed by Geoffrey Garen.

This allows arrowfunction-lexical-bind-arguments-top-level test to pass
in jsc as well as in browser.

Source/JavaScriptCore:

• jsc.cpp:

(GlobalObject::finishCreation):

LayoutTests:

• js/script-tests/arrowfunction-lexical-bind-arguments-top-level.js:

Removed @ skip annotation.

Location:

releases/WebKitGTK/webkit-2.12

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/js/script-tests/arrowfunction-lexical-bind-arguments-top-level.js (modified) (1 diff)
• Source/JavaScriptCore/ChangeLog (modified) (1 diff)
• Source/JavaScriptCore/jsc.cpp (modified) (1 diff)

releases/WebKitGTK/webkit-2.12/LayoutTests/ChangeLog

@@ +1 @@
+2016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [JSC shell] Don't put empty arguments array to VM.
+        https://bugs.webkit.org/show_bug.cgi?id=154516
+
+        Reviewed by Geoffrey Garen.
+
+        This allows arrowfunction-lexical-bind-arguments-top-level test to pass
+        in jsc as well as in browser.
+
+        * js/script-tests/arrowfunction-lexical-bind-arguments-top-level.js:
+        Removed @ skip annotation.
+
 2016-02-21  Chris Dumez  <cdumez@apple.com>
 

releases/WebKitGTK/webkit-2.12/LayoutTests/js/script-tests/arrowfunction-lexical-bind-arguments-top-level.js

@@ -1 @@
-// jsc always has arguments, but in browser we do not have arguments, so
-// ignore this test in run-jsc-stress-tests, but run in run-webkit-tests.
-//@ skip
-
 description('Tests for ES6 arrow function lexical bind of arguments on top level');
 

releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2016-02-22  Konstantin Tokarev  <annulen@yandex.ru>
+
+        [JSC shell] Don't put empty arguments array to VM.
+        https://bugs.webkit.org/show_bug.cgi?id=154516
+
+        Reviewed by Geoffrey Garen.
+
+        This allows arrowfunction-lexical-bind-arguments-top-level test to pass
+        in jsc as well as in browser.
+
+        * jsc.cpp:
+        (GlobalObject::finishCreation):
+
 2016-02-21  Joseph Pecoraro  <pecoraro@apple.com>
 

releases/WebKitGTK/webkit-2.12/Source/JavaScriptCore/jsc.cpp

@@ -753 +753 @@
 #endif
 
-        JSArray* array = constructEmptyArray(globalExec(), 0);
-        for (size_t i = 0; i < arguments.size(); ++i)
-            array->putDirectIndex(globalExec(), i, jsString(globalExec(), arguments[i]));
-        putDirect(vm, Identifier::fromString(globalExec(), "arguments"), array);
-        
+        if (!arguments.isEmpty()) {
+            JSArray* array = constructEmptyArray(globalExec(), 0);
+            for (size_t i = 0; i < arguments.size(); ++i)
+                array->putDirectIndex(globalExec(), i, jsString(globalExec(), arguments[i]));
+            putDirect(vm, Identifier::fromString(globalExec(), "arguments"), array);
+        }
+
         putDirect(vm, Identifier::fromString(globalExec(), "console"), jsUndefined());
     }