Changeset 200121 in webkit for trunk/Source/JavaScriptCore/jsc.cpp

Timestamp:

Apr 27, 2016, 12:12:06 AM (9 years ago)

Author:

[email protected]

Message:

JSC should have an option to allow global const redeclarations
​https://bugs.webkit.org/show_bug.cgi?id=157006

Reviewed by Geoffrey Garen.

Source/JavaScriptCore:

This patch implements an option that dictates whether
const redeclarations at the program level will throw.
This option defaults to true but allows users of JSC
to set it to false. This option is per VM. This is needed
for backwards compatibility with our old const implementation.

• jsc.cpp:

(GlobalObject::finishCreation):
(functionShadowChickenFunctionsOnStack):
(functionSetGlobalConstRedeclarationShouldNotThrow):
(functionReadline):

• runtime/Executable.cpp:

(JSC::ProgramExecutable::initializeGlobalProperties):

• runtime/JSGlobalLexicalEnvironment.cpp:

(JSC::JSGlobalLexicalEnvironment::put):
(JSC::JSGlobalLexicalEnvironment::isConstVariable):

• runtime/JSGlobalLexicalEnvironment.h:

(JSC::JSGlobalLexicalEnvironment::isEmpty):

• runtime/VM.h:

(JSC::VM::setGlobalConstRedeclarationShouldThrow):
(JSC::VM::globalConstRedeclarationShouldThrow):

• tests/stress/global-const-redeclaration-setting: Added.
• tests/stress/global-const-redeclaration-setting-2.js: Added.

(assert):

• tests/stress/global-const-redeclaration-setting-3.js: Added.

(assert):
(catch):

• tests/stress/global-const-redeclaration-setting-4.js: Added.

(assert):
(catch):

• tests/stress/global-const-redeclaration-setting-5.js: Added.

(assert):
(catch):

• tests/stress/global-const-redeclaration-setting.js: Added.

(assert):

• tests/stress/global-const-redeclaration-setting/first.js: Added.
• tests/stress/global-const-redeclaration-setting/let.js: Added.
• tests/stress/global-const-redeclaration-setting/second.js: Added.
• tests/stress/global-const-redeclaration-setting/strict.js: Added.

Source/WebCore:

This patch makes the JS VM not throw global const redeclaration
errors when the application is iBooks.

• bindings/js/JSDOMWindowBase.cpp:

(WebCore::JSDOMWindowBase::commonVM):

• page/Settings.h:

(WebCore::Settings::shouldUseHighResolutionTimers):
(WebCore::Settings::globalConstRedeclarationShouldThrow):
(WebCore::Settings::backgroundShouldExtendBeyondPage):

File:

• trunk/Source/JavaScriptCore/jsc.cpp (modified) (3 diffs)

trunk/Source/JavaScriptCore/jsc.cpp

@@ -635 +635 @@
 
 static EncodedJSValue JSC_HOST_CALL functionShadowChickenFunctionsOnStack(ExecState*);
+static EncodedJSValue JSC_HOST_CALL functionSetGlobalConstRedeclarationShouldNotThrow(ExecState*);
 
 struct Script {
@@ -779 +780 @@
 #endif
         addFunction(vm, "shadowChickenFunctionsOnStack", functionShadowChickenFunctionsOnStack, 0);
+        addFunction(vm, "setGlobalConstRedeclarationShouldNotThrow", functionSetGlobalConstRedeclarationShouldNotThrow, 0);
         addConstructableFunction(vm, "Root", functionCreateRoot, 0);
         addConstructableFunction(vm, "Element", functionCreateElement, 1);
@@ -1495 +1497 @@
 }
 
+EncodedJSValue JSC_HOST_CALL functionSetGlobalConstRedeclarationShouldNotThrow(ExecState* exec)
+{
+    exec->vm().setGlobalConstRedeclarationShouldThrow(false);
+    return JSValue::encode(jsUndefined());
+}
+
 EncodedJSValue JSC_HOST_CALL functionReadline(ExecState* exec)
 {