Ignore:
Timestamp:
Dec 23, 2013, 4:11:25 PM (12 years ago)
Author:
[email protected]
Message:

Refactor PutPropertySlot to be aware of custom properties
​https://bugs.webkit.org/show_bug.cgi?id=126187

Reviewed by msaboff.

Source/JavaScriptCore:

Refactor PutPropertySlot, making the constructor take the thisValue
used as a target. This results in a wide range of boilerplate changes
to pass the new parameter.

  • API/JSObjectRef.cpp:

(JSObjectSetProperty):

  • dfg/DFGOperations.cpp:

(JSC::DFG::operationPutByValInternal):

  • interpreter/Interpreter.cpp:

(JSC::Interpreter::execute):

  • jit/JITOperations.cpp:
  • llint/LLIntSlowPaths.cpp:

(JSC::LLInt::LLINT_SLOW_PATH_DECL):

  • runtime/Arguments.cpp:

(JSC::Arguments::putByIndex):

  • runtime/ArrayPrototype.cpp:

(JSC::putProperty):
(JSC::arrayProtoFuncPush):

  • runtime/JSCJSValue.cpp:

(JSC::JSValue::putToPrimitiveByIndex):

  • runtime/JSCell.cpp:

(JSC::JSCell::putByIndex):

  • runtime/JSFunction.cpp:

(JSC::JSFunction::put):

  • runtime/JSGenericTypedArrayViewInlines.h:

(JSC::JSGenericTypedArrayView<Adaptor>::putByIndex):

  • runtime/JSONObject.cpp:

(JSC::Walker::walk):

  • runtime/JSObject.cpp:

(JSC::JSObject::putByIndex):
(JSC::JSObject::putDirectNonIndexAccessor):
(JSC::JSObject::deleteProperty):

  • runtime/JSObject.h:

(JSC::JSObject::putDirect):

  • runtime/Lookup.h:

(JSC::putEntry):
(JSC::lookupPut):

  • runtime/PutPropertySlot.h:

(JSC::PutPropertySlot::PutPropertySlot):
(JSC::PutPropertySlot::setCustomProperty):
(JSC::PutPropertySlot::thisValue):
(JSC::PutPropertySlot::isCacheable):

Source/WebCore:

Update the bindings code generation and custom objects
to the new function signatures

  • bindings/js/JSDOMWindowCustom.cpp:

(WebCore::JSDOMWindow::put):

  • bindings/objc/WebScriptObject.mm:

(-[WebScriptObject setValue:forKey:]):

  • bindings/scripts/CodeGeneratorJS.pm:

(GenerateImplementation):

  • bindings/scripts/test/JS/JSTestInterface.cpp:

(WebCore::JSTestInterface::putByIndex):

  • bridge/NP_jsobject.cpp:

(_NPN_SetProperty):

Source/WebKit/mac:

Update for new method signatures.

  • Plugins/Hosted/NetscapePluginInstanceProxy.mm:

(WebKit::NetscapePluginInstanceProxy::setProperty):

Source/WebKit2:

Update for new method signatures.

  • WebProcess/Plugins/Netscape/NPJSObject.cpp:

(WebKit::NPJSObject::setProperty):

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/Source/JavaScriptCore/jit/JITOperations.cpp

    r160796 r161033  
    240240   
    241241    Identifier ident(vm, uid);
    242     PutPropertySlot slot(true, exec->codeBlock()->putByIdContext());
     242    PutPropertySlot slot(JSValue::decode(encodedBase), true, exec->codeBlock()->putByIdContext());
    243243    JSValue::decode(encodedBase).put(exec, ident, JSValue::decode(encodedValue), slot);
    244244}
    … …  
    250250   
    251251    Identifier ident(vm, uid);
    252     PutPropertySlot slot(false, exec->codeBlock()->putByIdContext());
     252    PutPropertySlot slot(JSValue::decode(encodedBase), false, exec->codeBlock()->putByIdContext());
    253253    JSValue::decode(encodedBase).put(exec, ident, JSValue::decode(encodedValue), slot);
    254254}
    … …  
    260260   
    261261    Identifier ident(vm, uid);
    262     PutPropertySlot slot(true, exec->codeBlock()->putByIdContext());
     262    PutPropertySlot slot(JSValue::decode(encodedBase), true, exec->codeBlock()->putByIdContext());
    263263    asObject(JSValue::decode(encodedBase))->putDirect(exec->vm(), ident, JSValue::decode(encodedValue), slot);
    264264}
    … …  
    270270   
    271271    Identifier ident(vm, uid);
    272     PutPropertySlot slot(false, exec->codeBlock()->putByIdContext());
     272    PutPropertySlot slot(JSValue::decode(encodedBase), false, exec->codeBlock()->putByIdContext());
    273273    asObject(JSValue::decode(encodedBase))->putDirect(exec->vm(), ident, JSValue::decode(encodedValue), slot);
    274274}
    … …  
    284284    JSValue value = JSValue::decode(encodedValue);
    285285    JSValue baseValue = JSValue::decode(encodedBase);
    286     PutPropertySlot slot(true, exec->codeBlock()->putByIdContext());
     286    PutPropertySlot slot(baseValue, true, exec->codeBlock()->putByIdContext());
    287287   
    288288    baseValue.put(exec, ident, value, slot);
    … …  
    307307    JSValue value = JSValue::decode(encodedValue);
    308308    JSValue baseValue = JSValue::decode(encodedBase);
    309     PutPropertySlot slot(false, exec->codeBlock()->putByIdContext());
     309    PutPropertySlot slot(baseValue, false, exec->codeBlock()->putByIdContext());
    310310   
    311311    baseValue.put(exec, ident, value, slot);
    … …  
    330330    JSValue value = JSValue::decode(encodedValue);
    331331    JSObject* baseObject = asObject(JSValue::decode(encodedBase));
    332     PutPropertySlot slot(true, exec->codeBlock()->putByIdContext());
     332    PutPropertySlot slot(baseObject, true, exec->codeBlock()->putByIdContext());
    333333   
    334334    baseObject->putDirect(exec->vm(), ident, value, slot);
    … …  
    353353    JSValue value = JSValue::decode(encodedValue);
    354354    JSObject* baseObject = asObject(JSValue::decode(encodedBase));
    355     PutPropertySlot slot(false, exec->codeBlock()->putByIdContext());
     355    PutPropertySlot slot(baseObject, false, exec->codeBlock()->putByIdContext());
    356356   
    357357    baseObject->putDirect(exec->vm(), ident, value, slot);
    … …  
    376376    JSValue value = JSValue::decode(encodedValue);
    377377    JSValue baseValue = JSValue::decode(encodedBase);
    378     PutPropertySlot slot(true, exec->codeBlock()->putByIdContext());
     378    PutPropertySlot slot(baseValue, true, exec->codeBlock()->putByIdContext());
    379379   
    380380    baseValue.put(exec, ident, value, slot);
    … …  
    396396    JSValue value = JSValue::decode(encodedValue);
    397397    JSValue baseValue = JSValue::decode(encodedBase);
    398     PutPropertySlot slot(false, exec->codeBlock()->putByIdContext());
     398    PutPropertySlot slot(baseValue, false, exec->codeBlock()->putByIdContext());
    399399   
    400400    baseValue.put(exec, ident, value, slot);
    … …  
    416416    JSValue value = JSValue::decode(encodedValue);
    417417    JSObject* baseObject = asObject(JSValue::decode(encodedBase));
    418     PutPropertySlot slot(true, exec->codeBlock()->putByIdContext());
     418    PutPropertySlot slot(baseObject, true, exec->codeBlock()->putByIdContext());
    419419   
    420420    baseObject->putDirect(exec->vm(), ident, value, slot);
    … …  
    436436    JSValue value = JSValue::decode(encodedValue);
    437437    JSObject* baseObject = asObject(JSValue::decode(encodedBase));
    438     PutPropertySlot slot(false, exec->codeBlock()->putByIdContext());
     438    PutPropertySlot slot(baseObject, false, exec->codeBlock()->putByIdContext());
    439439   
    440440    baseObject ->putDirect(exec->vm(), ident, value, slot);
    … …  
    470470            baseValue.putByIndex(callFrame, i, value, callFrame->codeBlock()->isStrictMode());
    471471    } else if (isName(subscript)) {
    472         PutPropertySlot slot(callFrame->codeBlock()->isStrictMode());
     472        PutPropertySlot slot(baseValue, callFrame->codeBlock()->isStrictMode());
    473473        baseValue.put(callFrame, jsCast<NameInstance*>(subscript.asCell())->privateName(), value, slot);
    474474    } else {
    475475        Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
    476476        if (!callFrame->vm().exception()) { // Don't put to an object if toString threw an exception.
    477             PutPropertySlot slot(callFrame->codeBlock()->isStrictMode());
     477            PutPropertySlot slot(baseValue, callFrame->codeBlock()->isStrictMode());
    478478            baseValue.put(callFrame, property, value, slot);
    479479        }
    … …  
    487487        baseObject->putDirectIndex(callFrame, i, value);
    488488    } else if (isName(subscript)) {
    489         PutPropertySlot slot(callFrame->codeBlock()->isStrictMode());
     489        PutPropertySlot slot(baseObject, callFrame->codeBlock()->isStrictMode());
    490490        baseObject->putDirect(callFrame->vm(), jsCast<NameInstance*>(subscript.asCell())->privateName(), value, slot);
    491491    } else {
    492492        Identifier property(callFrame, subscript.toString(callFrame)->value(callFrame));
    493493        if (!callFrame->vm().exception()) { // Don't put to an object if toString threw an exception.
    494             PutPropertySlot slot(callFrame->codeBlock()->isStrictMode());
     494            PutPropertySlot slot(baseObject, callFrame->codeBlock()->isStrictMode());
    495495            baseObject->putDirect(callFrame->vm(), property, value, slot);
    496496        }
    … …  
    16691669    }
    16701670
    1671     PutPropertySlot slot(codeBlock->isStrictMode());
     1671    PutPropertySlot slot(scope, codeBlock->isStrictMode());
    16721672    scope->methodTable()->put(scope, exec, ident, value, slot);
    16731673   
Note: See TracChangeset for help on using the changeset viewer.