Changeset 104886 in webkit for trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

Timestamp:

Jan 12, 2012, 5:40:22 PM (13 years ago)

Author:

[email protected]

Message:

Clean up putDirect (part 1)
​https://bugs.webkit.org/show_bug.cgi?id=76232

Reviewed by Sam Weinig.

putDirect has ambiguous semantics, clean these up a bit.

putDirect generally behaves a bit like a fast defineOwnProperty, but one that
always creates the property, with no checking to validate the put it permitted.

It also encompasses two slightly different behaviors.
(1) a fast form of put for JSActivation, which doesn't have to handle searching

the prototype chain, getter/setter properties, or the magic proto value.
Break this out as a new method, 'putOwnDataProperty'.

(2) the version of putDirect on JSValue will also check for overwriting ReadOnly

values, in strict mode. This is, however, not so smart on a few level, since
it is only called from op_put_by_id with direct set, which is only used with
an object as the base, and is only used to put new properties onto objects.

• dfg/DFGOperations.cpp:
• interpreter/Interpreter.cpp:

(JSC::Interpreter::privateExecute):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/JSActivation.cpp:

(JSC::JSActivation::put):

• runtime/JSFunction.cpp:

(JSC::JSFunction::getOwnPropertySlot):

• runtime/JSObject.h:

(JSC::JSObject::putOwnDataProperty):

• runtime/JSValue.h:

File:

• trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -3309 +3309 @@
 
         JSValue baseValue = callFrame->r(base).jsValue();
+        ASSERT(baseValue.isObject());
+        JSObject* baseObject = asObject(baseValue);
         Identifier& ident = codeBlock->identifier(property);
         PutPropertySlot slot(codeBlock->isStrictMode());
         if (direct)
-            baseValue.putDirect(callFrame, ident, callFrame->r(value).jsValue(), slot);
+            baseObject->putDirect(*globalData, ident, callFrame->r(value).jsValue(), slot);
         else
             baseValue.put(callFrame, ident, callFrame->r(value).jsValue(), slot);
@@ -3427 +3429 @@
 
         JSValue baseValue = callFrame->r(base).jsValue();
+        ASSERT(baseValue.isObject());
+        JSObject* baseObject = asObject(baseValue);
         Identifier& ident = codeBlock->identifier(property);
         PutPropertySlot slot(codeBlock->isStrictMode());
         if (direct)
-            baseValue.putDirect(callFrame, ident, callFrame->r(value).jsValue(), slot);
+            baseObject->putDirect(*globalData, ident, callFrame->r(value).jsValue(), slot);
         else
             baseValue.put(callFrame, ident, callFrame->r(value).jsValue(), slot);