#include "JSActivation.h"
#include "JSFunction.h"
#include "JSGlobalObject.h"
+#include "Operations.h"
using namespace std;
namespace JSC {
-ASSERT_CLASS_FITS_IN_CELL(Arguments);
-
-const ClassInfo Arguments::s_info = { "Arguments", &JSNonFinalObject::s_info, 0, 0, CREATE_METHOD_TABLE(Arguments) };
+const ClassInfo Arguments::s_info = { "Arguments", &Base::s_info, 0, 0, CREATE_METHOD_TABLE(Arguments) };
void Arguments::visitChildren(JSCell* cell, SlotVisitor& visitor)
{
ASSERT(thisObject->structure()->typeInfo().overridesVisitChildren());
JSObject::visitChildren(thisObject, visitor);
- if (thisObject->d->registerArray)
- visitor.appendValues(thisObject->d->registerArray.get(), thisObject->d->numArguments);
- visitor.append(&thisObject->d->callee);
- if (thisObject->d->activation)
- visitor.append(&thisObject->d->activation);
+ if (thisObject->m_registerArray)
+ visitor.appendValues(thisObject->m_registerArray.get(), thisObject->m_numArguments);
+ visitor.append(&thisObject->m_callee);
+ visitor.append(&thisObject->m_activation);
}
void Arguments::destroy(JSCell* cell)
{
-
jsCast<Arguments*>(cell)->Arguments::~Arguments();
+
static_cast<Arguments*>(cell)->Arguments::~Arguments();
}
void Arguments::copyToArguments(ExecState* exec, CallFrame* callFrame, uint32_t length)
{
- if (UNLIKELY(d->overrodeLength)) {
+ if (UNLIKELY(m_overrodeLength)) {
length = min(get(exec, exec->propertyNames().length).toUInt32(exec), length);
for (unsigned i = 0; i < length; i++)
callFrame->setArgument(i, get(exec, i));
}
ASSERT(length == this->length(exec));
for (size_t i = 0; i < length; ++i) {
- if (!d->deletedArguments || !d->deletedArguments[i])
- callFrame->setArgument(i, argument(i).get());
+ if (JSValue value = tryGetArgument(i))
+ callFrame->setArgument(i, value);
else
callFrame->setArgument(i, get(exec, i));
}
void Arguments::fillArgList(ExecState* exec, MarkedArgumentBuffer& args)
{
- if (UNLIKELY(d->overrodeLength)) {
+ if (UNLIKELY(m_overrodeLength)) {
unsigned length = get(exec, exec->propertyNames().length).toUInt32(exec);
for (unsigned i = 0; i < length; i++)
args.append(get(exec, i));
}
uint32_t length = this->length(exec);
for (size_t i = 0; i < length; ++i) {
- if (!d->deletedArguments || !d->deletedArguments[i])
- args.append(argument(i).get());
+ if (JSValue value = tryGetArgument(i))
+ args.append(value);
else
args.append(get(exec, i));
}
bool Arguments::getOwnPropertySlotByIndex(JSCell* cell, ExecState* exec, unsigned i, PropertySlot& slot)
{
Arguments* thisObject = jsCast<Arguments*>(cell);
- if (i < thisObject->d->numArguments && (!thisObject->d->deletedArguments || !thisObject->d->deletedArguments[i])) {
- slot.setValue(thisObject->argument(i).get());
+ if (JSValue value = thisObject->tryGetArgument(i)) {
+ slot.setValue(value);
return true;
}
- return JSObject::getOwnPropertySlot(thisObject, exec, Identifier(exec, UString::number(i)), slot);
+ return JSObject::getOwnPropertySlot(thisObject, exec, Identifier(exec, String::number(i)), slot);
}
void Arguments::createStrictModeCallerIfNecessary(ExecState* exec)
{
- if (d->overrodeCaller)
+ if (m_overrodeCaller)
return;
- d->overrodeCaller = true;
+ m_overrodeCaller = true;
PropertyDescriptor descriptor;
descriptor.setAccessorDescriptor(globalObject()->throwTypeErrorGetterSetter(exec), DontEnum | DontDelete | Accessor);
methodTable()->defineOwnProperty(this, exec, exec->propertyNames().caller, descriptor, false);
void Arguments::createStrictModeCalleeIfNecessary(ExecState* exec)
{
- if (d->overrodeCallee)
+ if (m_overrodeCallee)
return;
- d->overrodeCallee = true;
+ m_overrodeCallee = true;
PropertyDescriptor descriptor;
descriptor.setAccessorDescriptor(globalObject()->throwTypeErrorGetterSetter(exec), DontEnum | DontDelete | Accessor);
methodTable()->defineOwnProperty(this, exec, exec->propertyNames().callee, descriptor, false);
}
-bool Arguments::getOwnPropertySlot(JSCell* cell, ExecState* exec, const Identifier& propertyName, PropertySlot& slot)
+bool Arguments::getOwnPropertySlot(JSCell* cell, ExecState* exec, PropertyName propertyName, PropertySlot& slot)
{
Arguments* thisObject = jsCast<Arguments*>(cell);
- bool isArrayIndex;
- unsigned i = propertyName.toArrayIndex(isArrayIndex);
- if (isArrayIndex && i < thisObject->d->numArguments && (!thisObject->d->deletedArguments || !thisObject->d->deletedArguments[i])) {
- slot.setValue(thisObject->argument(i).get());
+ unsigned i = propertyName.asIndex();
+ if (JSValue value = thisObject->tryGetArgument(i)) {
+ RELEASE_ASSERT(i < PropertyName::NotAnIndex);
+ slot.setValue(value);
return true;
}
- if (propertyName == exec->propertyNames().length && LIKELY(!thisObject->d->overrodeLength)) {
- slot.setValue(jsNumber(thisObject->d->numArguments));
+ if (propertyName == exec->propertyNames().length && LIKELY(!thisObject->m_overrodeLength)) {
+ slot.setValue(jsNumber(thisObject->m_numArguments));
return true;
}
- if (propertyName == exec->propertyNames().callee && LIKELY(!thisObject->d->overrodeCallee)) {
- if (!thisObject->d->isStrictMode) {
- slot.setValue(thisObject->d->callee.get());
+ if (propertyName == exec->propertyNames().callee && LIKELY(!thisObject->m_overrodeCallee)) {
+ if (!thisObject->m_isStrictMode) {
+ slot.setValue(thisObject->m_callee.get());
return true;
}
thisObject->createStrictModeCalleeIfNecessary(exec);
}
- if (propertyName == exec->propertyNames().caller && thisObject->d->isStrictMode)
+ if (propertyName == exec->propertyNames().caller && thisObject->m_isStrictMode)
thisObject->createStrictModeCallerIfNecessary(exec);
return JSObject::getOwnPropertySlot(thisObject, exec, propertyName, slot);
}
-bool Arguments::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor)
+bool Arguments::getOwnPropertyDescriptor(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor)
{
Arguments* thisObject = jsCast<Arguments*>(object);
- bool isArrayIndex;
- unsigned i = propertyName.toArrayIndex(isArrayIndex);
- if (isArrayIndex && i < thisObject->d->numArguments && (!thisObject->d->deletedArguments || !thisObject->d->deletedArguments[i])) {
- descriptor.setDescriptor(thisObject->argument(i).get(), None);
+ unsigned i = propertyName.asIndex();
+ if (JSValue value = thisObject->tryGetArgument(i)) {
+ RELEASE_ASSERT(i < PropertyName::NotAnIndex);
+ descriptor.setDescriptor(value, None);
return true;
}
- if (propertyName == exec->propertyNames().length && LIKELY(!thisObject->d->overrodeLength)) {
- descriptor.setDescriptor(jsNumber(thisObject->d->numArguments), DontEnum);
+ if (propertyName == exec->propertyNames().length && LIKELY(!thisObject->m_overrodeLength)) {
+ descriptor.setDescriptor(jsNumber(thisObject->m_numArguments), DontEnum);
return true;
}
- if (propertyName == exec->propertyNames().callee && LIKELY(!thisObject->d->overrodeCallee)) {
- if (!thisObject->d->isStrictMode) {
- descriptor.setDescriptor(thisObject->d->callee.get(), DontEnum);
+ if (propertyName == exec->propertyNames().callee && LIKELY(!thisObject->m_overrodeCallee)) {
+ if (!thisObject->m_isStrictMode) {
+ descriptor.setDescriptor(thisObject->m_callee.get(), DontEnum);
return true;
}
thisObject->createStrictModeCalleeIfNecessary(exec);
}
- if (propertyName == exec->propertyNames().caller && thisObject->d->isStrictMode)
+ if (propertyName == exec->propertyNames().caller && thisObject->m_isStrictMode)
thisObject->createStrictModeCallerIfNecessary(exec);
return JSObject::getOwnPropertyDescriptor(thisObject, exec, propertyName, descriptor);
void Arguments::getOwnPropertyNames(JSObject* object, ExecState* exec, PropertyNameArray& propertyNames, EnumerationMode mode)
{
Arguments* thisObject = jsCast<Arguments*>(object);
- for (unsigned i = 0; i < thisObject->d->numArguments; ++i) {
- if (!thisObject->d->deletedArguments || !thisObject->d->deletedArguments[i])
- propertyNames.add(Identifier(exec, UString::number(i)));
+ for (unsigned i = 0; i < thisObject->m_numArguments; ++i) {
+ if (!thisObject->isArgument(i))
+ continue;
+ propertyNames.add(Identifier(exec, String::number(i)));
}
if (mode == IncludeDontEnumProperties) {
propertyNames.add(exec->propertyNames().callee);
void Arguments::putByIndex(JSCell* cell, ExecState* exec, unsigned i, JSValue value, bool shouldThrow)
{
Arguments* thisObject = jsCast<Arguments*>(cell);
- if (i < static_cast<unsigned>(thisObject->d->numArguments) && (!thisObject->d->deletedArguments || !thisObject->d->deletedArguments[i])) {
- thisObject->argument(i).set(exec->globalData(), thisObject, value);
+ if (thisObject->trySetArgument(exec->vm(), i, value))
return;
- }
PutPropertySlot slot(shouldThrow);
- JSObject::put(thisObject, exec, Identifier(exec, UString::number(i)), value, slot);
+ JSObject::put(thisObject, exec, Identifier(exec, String::number(i)), value, slot);
}
-void Arguments::put(JSCell* cell, ExecState* exec, const Identifier& propertyName, JSValue value, PutPropertySlot& slot)
+void Arguments::put(JSCell* cell, ExecState* exec, PropertyName propertyName, JSValue value, PutPropertySlot& slot)
{
Arguments* thisObject = jsCast<Arguments*>(cell);
- bool isArrayIndex;
- unsigned i = propertyName.toArrayIndex(isArrayIndex);
- if (isArrayIndex && i < thisObject->d->numArguments && (!thisObject->d->deletedArguments || !thisObject->d->deletedArguments[i])) {
- thisObject->argument(i).set(exec->globalData(), thisObject, value);
+ unsigned i = propertyName.asIndex();
+ if (thisObject->trySetArgument(exec->vm(), i, value))
return;
- }
- if (propertyName == exec->propertyNames().length && !thisObject->d->overrodeLength) {
- thisObject->d->overrodeLength = true;
- thisObject->putDirect(exec->globalData(), propertyName, value, DontEnum);
+ if (propertyName == exec->propertyNames().length && !thisObject->m_overrodeLength) {
+ thisObject->m_overrodeLength = true;
+ thisObject->putDirect(exec->vm(), propertyName, value, DontEnum);
return;
}
- if (propertyName == exec->propertyNames().callee && !thisObject->d->overrodeCallee) {
- if (!thisObject->d->isStrictMode) {
- thisObject->d->overrodeCallee = true;
- thisObject->putDirect(exec->globalData(), propertyName, value, DontEnum);
+ if (propertyName == exec->propertyNames().callee && !thisObject->m_overrodeCallee) {
+ if (!thisObject->m_isStrictMode) {
+ thisObject->m_overrodeCallee = true;
+ thisObject->putDirect(exec->vm(), propertyName, value, DontEnum);
return;
}
thisObject->createStrictModeCalleeIfNecessary(exec);
}
- if (propertyName == exec->propertyNames().caller && thisObject->d->isStrictMode)
+ if (propertyName == exec->propertyNames().caller && thisObject->m_isStrictMode)
thisObject->createStrictModeCallerIfNecessary(exec);
JSObject::put(thisObject, exec, propertyName, value, slot);
bool Arguments::deletePropertyByIndex(JSCell* cell, ExecState* exec, unsigned i)
{
Arguments* thisObject = jsCast<Arguments*>(cell);
- if (i < thisObject->d->numArguments) {
+ if (i < thisObject->m_numArguments) {
if (!Base::deletePropertyByIndex(cell, exec, i))
return false;
-
- if (!thisObject->d->deletedArguments) {
- thisObject->d->deletedArguments = adoptArrayPtr(new bool[thisObject->d->numArguments]);
- memset(thisObject->d->deletedArguments.get(), 0, sizeof(bool) * thisObject->d->numArguments);
- }
- if (!thisObject->d->deletedArguments[i]) {
- thisObject->d->deletedArguments[i] = true;
+ if (thisObject->tryDeleteArgument(i))
return true;
- }
}
-
- return JSObject::deleteProperty(thisObject, exec, Identifier(exec, UString::number(i)));
+ return JSObject::deletePropertyByIndex(thisObject, exec, i);
}
-bool Arguments::deleteProperty(JSCell* cell, ExecState* exec, const Identifier& propertyName)
+bool Arguments::deleteProperty(JSCell* cell, ExecState* exec, PropertyName propertyName)
{
- if (exec->globalData().isInDefineOwnProperty())
+ if (exec->vm().isInDefineOwnProperty())
return Base::deleteProperty(cell, exec, propertyName);
Arguments* thisObject = jsCast<Arguments*>(cell);
- bool isArrayIndex;
- unsigned i = propertyName.toArrayIndex(isArrayIndex);
- if (isArrayIndex && i < thisObject->d->numArguments) {
+ unsigned i = propertyName.asIndex();
+ if (i < thisObject->m_numArguments) {
+ RELEASE_ASSERT(i < PropertyName::NotAnIndex);
if (!Base::deleteProperty(cell, exec, propertyName))
return false;
-
- if (!thisObject->d->deletedArguments) {
- thisObject->d->deletedArguments = adoptArrayPtr(new bool[thisObject->d->numArguments]);
- memset(thisObject->d->deletedArguments.get(), 0, sizeof(bool) * thisObject->d->numArguments);
- }
- if (!thisObject->d->deletedArguments[i]) {
- thisObject->d->deletedArguments[i] = true;
+ if (thisObject->tryDeleteArgument(i))
return true;
- }
}
- if (propertyName == exec->propertyNames().length && !thisObject->d->overrodeLength) {
- thisObject->d->overrodeLength = true;
+ if (propertyName == exec->propertyNames().length && !thisObject->m_overrodeLength) {
+ thisObject->m_overrodeLength = true;
return true;
}
- if (propertyName == exec->propertyNames().callee && !thisObject->d->overrodeCallee) {
- if (!thisObject->d->isStrictMode) {
- thisObject->d->overrodeCallee = true;
+ if (propertyName == exec->propertyNames().callee && !thisObject->m_overrodeCallee) {
+ if (!thisObject->m_isStrictMode) {
+ thisObject->m_overrodeCallee = true;
return true;
}
thisObject->createStrictModeCalleeIfNecessary(exec);
}
- if (propertyName == exec->propertyNames().caller && thisObject->d->isStrictMode)
+ if (propertyName == exec->propertyNames().caller && thisObject->m_isStrictMode)
thisObject->createStrictModeCallerIfNecessary(exec);
return JSObject::deleteProperty(thisObject, exec, propertyName);
}
-bool Arguments::defineOwnProperty(JSObject* object, ExecState* exec, const Identifier& propertyName, PropertyDescriptor& descriptor, bool shouldThrow)
+bool Arguments::defineOwnProperty(JSObject* object, ExecState* exec, PropertyName propertyName, PropertyDescriptor& descriptor, bool shouldThrow)
{
Arguments* thisObject = jsCast<Arguments*>(object);
- bool isArrayIndex;
- unsigned i = propertyName.toArrayIndex(isArrayIndex);
- if (isArrayIndex && i < thisObject->d->numArguments) {
+ unsigned i = propertyName.asIndex();
+ if (i < thisObject->m_numArguments) {
+ RELEASE_ASSERT(i < PropertyName::NotAnIndex);
// If the property is not yet present on the object, and is not yet marked as deleted, then add it now.
PropertySlot slot;
- if ((!thisObject->d->deletedArguments || !thisObject->d->deletedArguments[i]) && !JSObject::getOwnPropertySlot(thisObject, exec, propertyName, slot))
- object->putDirect(exec->globalData(), propertyName, thisObject->argument(i).get(), 0);
+ if (!thisObject->isDeletedArgument(i) && !JSObject::getOwnPropertySlot(thisObject, exec, propertyName, slot)) {
+ JSValue value = thisObject->tryGetArgument(i);
+ ASSERT(value);
+ object->putDirectMayBeIndex(exec, propertyName, value);
+ }
if (!Base::defineOwnProperty(object, exec, propertyName, descriptor, shouldThrow))
return false;
- if (!thisObject->d->deletedArguments) {
- thisObject->d->deletedArguments = adoptArrayPtr(new bool[thisObject->d->numArguments]);
- memset(thisObject->d->deletedArguments.get(), 0, sizeof(bool) * thisObject->d->numArguments);
- }
// From ES 5.1, 10.6 Arguments Object
// 5. If the value of isMapped is not undefined, then
- if (!thisObject->d->deletedArguments[i]) {
+ if (thisObject->isArgument(i)) {
// a. If IsAccessorDescriptor(Desc) is true, then
if (descriptor.isAccessorDescriptor()) {
// i. Call the [[Delete]] internal method of map passing P, and false as the arguments.
- thisObject->d->deletedArguments[i] = true;
+ thisObject->tryDeleteArgument(i);
} else { // b. Else
// i. If Desc.[[Value]] is present, then
// 1. Call the [[Put]] internal method of map passing P, Desc.[[Value]], and Throw as the arguments.
if (descriptor.value())
- thisObject->argument(i).set(exec->globalData(), thisObject, descriptor.value());
+ thisObject->trySetArgument(exec->vm(), i, descriptor.value());
// ii. If Desc.[[Writable]] is present and its value is false, then
// 1. Call the [[Delete]] internal method of map passing P and false as arguments.
if (descriptor.writablePresent() && !descriptor.writable())
- thisObject->d->deletedArguments[i] = true;
+ thisObject->tryDeleteArgument(i);
}
}
return true;
}
- if (propertyName == exec->propertyNames().length && !thisObject->d->overrodeLength) {
- thisObject->putDirect(exec->globalData(), propertyName, jsNumber(thisObject->d->numArguments), DontEnum);
- thisObject->d->overrodeLength = true;
- } else if (propertyName == exec->propertyNames().callee && !thisObject->d->overrodeCallee) {
- thisObject->putDirect(exec->globalData(), propertyName, thisObject->d->callee.get(), DontEnum);
- thisObject->d->overrodeCallee = true;
- } else if (propertyName == exec->propertyNames().caller && thisObject->d->isStrictMode)
+ if (propertyName == exec->propertyNames().length && !thisObject->m_overrodeLength) {
+ thisObject->putDirect(exec->vm(), propertyName, jsNumber(thisObject->m_numArguments), DontEnum);
+ thisObject->m_overrodeLength = true;
+ } else if (propertyName == exec->propertyNames().callee && !thisObject->m_overrodeCallee) {
+ thisObject->putDirect(exec->vm(), propertyName, thisObject->m_callee.get(), DontEnum);
+ thisObject->m_overrodeCallee = true;
+ } else if (propertyName == exec->propertyNames().caller && thisObject->m_isStrictMode)
thisObject->createStrictModeCallerIfNecessary(exec);
return Base::defineOwnProperty(object, exec, propertyName, descriptor, shouldThrow);
if (isTornOff())
return;
- if (!d->numArguments)
+ if (!m_numArguments)
return;
- d->registerArray = adoptArrayPtr(new WriteBarrier<Unknown>[d->numArguments]);
- d->registers = d->registerArray.get() + CallFrame::offsetFor(d->numArguments + 1);
+ // Must be called for the same call frame from which it was created.
+ ASSERT(bitwise_cast<WriteBarrier<Unknown>*>(callFrame) == m_registers);
+
+ m_registerArray = adoptArrayPtr(new WriteBarrier<Unknown>[m_numArguments]);
+ m_registers = m_registerArray.get() + CallFrame::offsetFor(m_numArguments + 1);
+
+ // If we have a captured argument that logically aliases activation storage,
+ // but we optimize away the activation, the argument needs to tear off into
+ // our storage. The simplest way to do this is to revert it to Normal status.
+ if (m_slowArguments && !m_activation) {
+ for (size_t i = 0; i < m_numArguments; ++i) {
+ if (m_slowArguments[i].status != SlowArgument::Captured)
+ continue;
+ m_slowArguments[i].status = SlowArgument::Normal;
+ m_slowArguments[i].index = CallFrame::argumentOffset(i);
+ }
+ }
if (!callFrame->isInlineCallFrame()) {
- for (size_t i = 0; i < d->numArguments; ++i)
- argument(i).set(callFrame->globalData(), this, callFrame->argument(i));
+ for (size_t i = 0; i < m_numArguments; ++i)
+ trySetArgument(callFrame->vm(), i, callFrame->argumentAfterCapture(i));
return;
}
- InlineCallFrame* inlineCallFrame = callFrame->inlineCallFrame();
- for (size_t i = 0; i < d->numArguments; ++i) {
+ tearOffForInlineCallFrame(
+ callFrame->vm(), callFrame->registers(), callFrame->inlineCallFrame());
+}
+
+void Arguments::didTearOffActivation(ExecState* exec, JSActivation* activation)
+{
+ RELEASE_ASSERT(activation);
+ if (isTornOff())
+ return;
+
+ if (!m_numArguments)
+ return;
+
+ m_activation.set(exec->vm(), this, activation);
+ tearOff(exec);
+}
+
+void Arguments::tearOff(CallFrame* callFrame, InlineCallFrame* inlineCallFrame)
+{
+ if (isTornOff())
+ return;
+
+ if (!m_numArguments)
+ return;
+
+ m_registerArray = adoptArrayPtr(new WriteBarrier<Unknown>[m_numArguments]);
+ m_registers = m_registerArray.get() + CallFrame::offsetFor(m_numArguments + 1);
+
+ tearOffForInlineCallFrame(
+ callFrame->vm(), callFrame->registers() + inlineCallFrame->stackOffset,
+ inlineCallFrame);
+}
+
+void Arguments::tearOffForInlineCallFrame(VM& vm, Register* registers, InlineCallFrame* inlineCallFrame)
+{
+ for (size_t i = 0; i < m_numArguments; ++i) {
ValueRecovery& recovery = inlineCallFrame->arguments[i + 1];
// In the future we'll support displaced recoveries (indicating that the
// argument was flushed to a different location), but for now we don't do
// it's much less likely that we'll support in-register recoveries since
// this code does not (easily) have access to registers.
JSValue value;
- Register* location = &callFrame->registers()[CallFrame::argumentOffset(i)];
+ Register* location = ®isters[CallFrame::argumentOffset(i)];
switch (recovery.technique()) {
- case AlreadyInRegisterFile:
+ case AlreadyInJSStack:
value = location->jsValue();
break;
- case AlreadyInRegisterFileAsUnboxedInt32:
+ case AlreadyInJSStackAsUnboxedInt32:
value = jsNumber(location->unboxedInt32());
break;
- case AlreadyInRegisterFileAsUnboxedCell:
+ case AlreadyInJSStackAsUnboxedCell:
value = location->unboxedCell();
break;
- case AlreadyInRegisterFileAsUnboxedBoolean:
+ case AlreadyInJSStackAsUnboxedBoolean:
value = jsBoolean(location->unboxedBoolean());
break;
- case AlreadyInRegisterFileAsUnboxedDouble:
+ case AlreadyInJSStackAsUnboxedDouble:
#if USE(JSVALUE64)
value = jsNumber(*bitwise_cast<double*>(location));
#else
value = recovery.constant();
break;
default:
- ASSERT_NOT_REACHED();
+ RELEASE_ASSERT_NOT_REACHED();
break;
}
- argument(i).set(callFrame->globalData(), this, value);
+ trySetArgument(vm, i, value);
}
}
projects / apple / javascriptcore.git / blobdiff