* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in the
* documentation and/or other materials provided with the distribution.
- * 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
+ * 3. Neither the name of Apple Inc. ("Apple") nor the names of
* its contributors may be used to endorse or promote products derived
* from this software without specific prior written permission.
*
#include "Arguments.h"
#include "Interpreter.h"
#include "JSFunction.h"
-#include "Operations.h"
+#include "JSCInlines.h"
using namespace std;
void JSActivation::visitChildren(JSCell* cell, SlotVisitor& visitor)
{
JSActivation* thisObject = jsCast<JSActivation*>(cell);
- ASSERT_GC_OBJECT_INHERITS(thisObject, &s_info);
+ ASSERT_GC_OBJECT_INHERITS(thisObject, info());
COMPILE_ASSERT(StructureFlags & OverridesVisitChildren, OverridesVisitChildrenWithoutSettingFlag);
ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
Base::visitChildren(thisObject, visitor);
inline bool JSActivation::symbolTableGet(PropertyName propertyName, PropertySlot& slot)
{
- SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.publicName());
+ SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.uid());
if (entry.isNull())
return false;
if (isTornOff() && !isValid(entry))
return false;
- slot.setValue(registerAt(entry.getIndex()).get());
+ slot.setValue(this, DontEnum, registerAt(entry.getIndex()).get());
return true;
}
inline bool JSActivation::symbolTableGet(PropertyName propertyName, PropertyDescriptor& descriptor)
{
- SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.publicName());
+ SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.uid());
if (entry.isNull())
return false;
VM& vm = exec->vm();
ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
- SymbolTableEntry entry = symbolTable()->inlineGet(propertyName.publicName());
- if (entry.isNull())
- return false;
- if (entry.isReadOnly()) {
- if (shouldThrow)
- throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
- return true;
+ WriteBarrierBase<Unknown>* reg;
+ {
+ GCSafeConcurrentJITLocker locker(symbolTable()->m_lock, exec->vm().heap);
+ SymbolTable::Map::iterator iter = symbolTable()->find(locker, propertyName.uid());
+ if (iter == symbolTable()->end(locker))
+ return false;
+ ASSERT(!iter->value.isNull());
+ if (iter->value.isReadOnly()) {
+ if (shouldThrow)
+ throwTypeError(exec, StrictModeReadonlyPropertyWriteError);
+ return true;
+ }
+ // Defend against the inspector asking for a var after it has been optimized out.
+ if (isTornOff() && !isValid(iter->value))
+ return false;
+ if (VariableWatchpointSet* set = iter->value.watchpointSet())
+ set->invalidate(); // Don't mess around - if we had found this statically, we would have invcalidated it.
+ reg = ®isterAt(iter->value.getIndex());
}
-
- // Defend against the inspector asking for a var after it has been optimized out.
- if (isTornOff() && !isValid(entry))
- return false;
-
- registerAt(entry.getIndex()).set(vm, this, value);
+ reg->set(vm, this, value);
return true;
}
{
JSActivation* thisObject = jsCast<JSActivation*>(object);
- if (mode == IncludeDontEnumProperties && !thisObject->isTornOff())
+ CallFrame* callFrame = CallFrame::create(reinterpret_cast<Register*>(thisObject->m_registers));
+ if (mode == IncludeDontEnumProperties && !thisObject->isTornOff() && (callFrame->codeBlock()->usesArguments() || callFrame->codeBlock()->usesEval()))
propertyNames.add(exec->propertyNames().arguments);
- SymbolTable::const_iterator end = thisObject->symbolTable()->end();
- for (SymbolTable::const_iterator it = thisObject->symbolTable()->begin(); it != end; ++it) {
- if (it->value.getAttributes() & DontEnum && mode != IncludeDontEnumProperties)
- continue;
- if (!thisObject->isValid(it->value))
- continue;
- propertyNames.add(Identifier(exec, it->key.get()));
+ {
+ ConcurrentJITLocker locker(thisObject->symbolTable()->m_lock);
+ SymbolTable::Map::iterator end = thisObject->symbolTable()->end(locker);
+ for (SymbolTable::Map::iterator it = thisObject->symbolTable()->begin(locker); it != end; ++it) {
+ if (it->value.getAttributes() & DontEnum && mode != IncludeDontEnumProperties)
+ continue;
+ if (!thisObject->isValid(it->value))
+ continue;
+ propertyNames.add(Identifier(exec, it->key.get()));
+ }
}
// Skip the JSVariableObject implementation of getOwnNonIndexPropertyNames
JSObject::getOwnNonIndexPropertyNames(thisObject, exec, propertyNames, mode);
{
ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(this));
- SymbolTable::iterator iter = symbolTable()->find(propertyName.publicName());
- if (iter == symbolTable()->end())
- return false;
- SymbolTableEntry& entry = iter->value;
- ASSERT(!entry.isNull());
- if (!isValid(entry))
- return false;
-
- entry.setAttributes(attributes);
- registerAt(entry.getIndex()).set(vm, this, value);
+ WriteBarrierBase<Unknown>* reg;
+ {
+ ConcurrentJITLocker locker(symbolTable()->m_lock);
+ SymbolTable::Map::iterator iter = symbolTable()->find(locker, propertyName.uid());
+ if (iter == symbolTable()->end(locker))
+ return false;
+ SymbolTableEntry& entry = iter->value;
+ ASSERT(!entry.isNull());
+ if (!isValid(entry))
+ return false;
+
+ entry.setAttributes(attributes);
+ reg = ®isterAt(entry.getIndex());
+ }
+ reg->set(vm, this, value);
return true;
}
-bool JSActivation::getOwnPropertySlot(JSCell* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
+bool JSActivation::getOwnPropertySlot(JSObject* object, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
{
- JSActivation* thisObject = jsCast<JSActivation*>(cell);
+ JSActivation* thisObject = jsCast<JSActivation*>(object);
if (propertyName == exec->propertyNames().arguments) {
// Defend against the inspector asking for the arguments object after it has been optimized out.
- if (!thisObject->isTornOff()) {
- slot.setCustom(thisObject, thisObject->getArgumentsGetter());
+ CallFrame* callFrame = CallFrame::create(reinterpret_cast<Register*>(thisObject->m_registers));
+ if (!thisObject->isTornOff() && (callFrame->codeBlock()->usesArguments() || callFrame->codeBlock()->usesEval())) {
+ slot.setCustom(thisObject, DontEnum, argumentsGetter);
return true;
}
}
if (thisObject->symbolTableGet(propertyName, slot))
return true;
- if (JSValue value = thisObject->getDirect(exec->vm(), propertyName)) {
- slot.setValue(value);
+ unsigned attributes;
+ if (JSValue value = thisObject->getDirect(exec->vm(), propertyName, attributes)) {
+ slot.setValue(thisObject, attributes, value);
return true;
}
return false;
}
-bool JSActivation::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
-{
- JSActivation* thisObject = jsCast<JSActivation*>(object);
-
- if (propertyName == exec->propertyNames().arguments) {
- // Defend against the inspector asking for the arguments object after it has been optimized out.
- if (!thisObject->isTornOff()) {
- PropertySlot slot;
- JSActivation::getOwnPropertySlot(thisObject, exec, propertyName, slot);
- descriptor.setDescriptor(slot.getValue(exec, propertyName), DontEnum);
- return true;
- }
- }
-
- if (thisObject->symbolTableGet(propertyName, descriptor))
- return true;
-
- return Base::getOwnPropertyDescriptor(object, exec, propertyName, descriptor);
-}
-
void JSActivation::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
{
JSActivation* thisObject = jsCast<JSActivation*>(cell);
thisObject->putOwnDataProperty(exec->vm(), propertyName, value, slot);
}
-// FIXME: Make this function honor ReadOnly (const) and DontEnum
-void JSActivation::putDirectVirtual(JSObject* object, ExecState* exec, PropertyName propertyName, JSValue value, unsigned attributes)
-{
- JSActivation* thisObject = jsCast<JSActivation*>(object);
- ASSERT(!Heap::heap(value) || Heap::heap(value) == Heap::heap(thisObject));
-
- if (thisObject->symbolTablePutWithAttributes(exec->vm(), propertyName, value, attributes))
- return;
-
- // We don't call through to JSObject because __proto__ and getter/setter
- // properties are non-standard extensions that other implementations do not
- // expose in the activation object.
- ASSERT(!thisObject->hasGetterSetterProperties());
- JSObject::putDirectVirtual(thisObject, exec, propertyName, value, attributes);
-}
-
bool JSActivation::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
{
if (propertyName == exec->propertyNames().arguments)
return Base::deleteProperty(cell, exec, propertyName);
}
-JSObject* JSActivation::toThisObject(JSCell*, ExecState* exec)
+JSValue JSActivation::toThis(JSCell*, ExecState* exec, ECMAMode ecmaMode)
{
+ if (ecmaMode == StrictMode)
+ return jsUndefined();
return exec->globalThisValue();
}
-JSValue JSActivation::argumentsGetter(ExecState*, JSValue slotBase, PropertyName)
+EncodedJSValue JSActivation::argumentsGetter(ExecState*, JSObject* slotBase, EncodedJSValue, PropertyName)
{
JSActivation* activation = jsCast<JSActivation*>(slotBase);
- if (activation->isTornOff())
- return jsUndefined();
-
CallFrame* callFrame = CallFrame::create(reinterpret_cast<Register*>(activation->m_registers));
- int argumentsRegister = callFrame->codeBlock()->argumentsRegister();
- if (JSValue arguments = callFrame->uncheckedR(argumentsRegister).jsValue())
- return arguments;
- int realArgumentsRegister = unmodifiedArgumentsRegister(argumentsRegister);
+ ASSERT(!activation->isTornOff() && (callFrame->codeBlock()->usesArguments() || callFrame->codeBlock()->usesEval()));
+ if (activation->isTornOff() || !(callFrame->codeBlock()->usesArguments() || callFrame->codeBlock()->usesEval()))
+ return JSValue::encode(jsUndefined());
+
+ VirtualRegister argumentsRegister = callFrame->codeBlock()->argumentsRegister();
+ if (JSValue arguments = callFrame->uncheckedR(argumentsRegister.offset()).jsValue())
+ return JSValue::encode(arguments);
+ int realArgumentsRegister = unmodifiedArgumentsRegister(argumentsRegister).offset();
JSValue arguments = JSValue(Arguments::create(callFrame->vm(), callFrame));
- callFrame->uncheckedR(argumentsRegister) = arguments;
+ callFrame->uncheckedR(argumentsRegister.offset()) = arguments;
callFrame->uncheckedR(realArgumentsRegister) = arguments;
- ASSERT(callFrame->uncheckedR(realArgumentsRegister).jsValue().inherits(&Arguments::s_info));
- return callFrame->uncheckedR(realArgumentsRegister).jsValue();
-}
-
-// These two functions serve the purpose of isolating the common case from a
-// PIC branch.
-
-PropertySlot::GetValueFunc JSActivation::getArgumentsGetter()
-{
- return argumentsGetter;
+ ASSERT(callFrame->uncheckedR(realArgumentsRegister).jsValue().inherits(Arguments::info()));
+ return JSValue::encode(callFrame->uncheckedR(realArgumentsRegister).jsValue());
}
} // namespace JSC
projects / apple / javascriptcore.git / blobdiff