Changeset 103697 in webkit for trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

Timestamp:

Dec 26, 2011, 8:56:37 PM (13 years ago)

Author:

[email protected]

Message:

​https://bugs.webkit.org/show_bug.cgi?id=75231
Fail to throw in strict mode on assign to read only static properties

Reviewed by Filip Pizlo.

Source/JavaScriptCore:

There are three bugs here:

• symbolTablePut should throw for strict mode accesses.
• lookupPut should throw for strict mode accesses.
• NumberConstructor should override put to call lookupPut, to trap assignment to readonly properties.

• runtime/JSActivation.cpp:

(JSC::JSActivation::symbolTablePut):
(JSC::JSActivation::put):

• runtime/JSActivation.h:
• runtime/JSGlobalObject.cpp:

(JSC::JSGlobalObject::put):

• runtime/JSStaticScopeObject.cpp:

(JSC::JSStaticScopeObject::put):

• runtime/JSVariableObject.h:

(JSC::JSVariableObject::symbolTablePut):

• runtime/Lookup.h:

(JSC::lookupPut):

• runtime/NumberConstructor.cpp:

(JSC::NumberConstructor::put):

• runtime/NumberConstructor.h:

LayoutTests:

Added test cases / updated now-passing results.

• fast/js/mozilla/strict/15.10.7-expected.txt:
• fast/js/script-tests/strict-readonly-statics.js: Added.

(testWindowUndefined):
(testNumberMAX_VALUE):

• fast/js/strict-readonly-statics-expected.txt: Added.
• fast/js/strict-readonly-statics.html: Added.

File:

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

trunk/Source/JavaScriptCore/runtime/JSActivation.cpp

@@ -98 +98 @@
 }
 
-inline bool JSActivation::symbolTablePut(JSGlobalData& globalData, const Identifier& propertyName, JSValue value)
-{
+inline bool JSActivation::symbolTablePut(ExecState* exec, const Identifier& propertyName, JSValue value, bool shouldThrow)
+{
+    JSGlobalData& globalData = exec->globalData();
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
     
@@ -105 +106 @@
     if (entry.isNull())
         return false;
-    if (entry.isReadOnly())
-        return true;
+    if (entry.isReadOnly()) {
+        if (shouldThrow)
+            throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
+        return true;
+    }
     if (entry.getIndex() >= m_numCapturedVars)
         return false;
@@ -174 +178 @@
     ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(thisObject));
 
-    if (thisObject->symbolTablePut(exec->globalData(), propertyName, value))
+    if (thisObject->symbolTablePut(exec, propertyName, value, slot.isStrictMode()))
         return;