| Index: src/ia32/lithium-ia32.cc
|
| diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
|
| index a7bb2d95fbdf539fdb40b949145842dd50f9b9c9..9c0e32b655df876da47c647c585ec59393685dd0 100644
|
| --- a/src/ia32/lithium-ia32.cc
|
| +++ b/src/ia32/lithium-ia32.cc
|
| @@ -2291,19 +2291,21 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
|
| val = UseX87TopOfStack(instr->value());
|
| }
|
| LOperand* key = UseRegisterOrConstantAtStart(instr->key());
|
| -
|
| return new(zone()) LStoreKeyed(object, key, val);
|
| } else {
|
| ASSERT(instr->value()->representation().IsTagged());
|
| bool needs_write_barrier = instr->NeedsWriteBarrier();
|
|
|
| LOperand* obj = UseRegister(instr->elements());
|
| - LOperand* val = needs_write_barrier
|
| - ? UseTempRegister(instr->value())
|
| - : UseRegisterAtStart(instr->value());
|
| - LOperand* key = needs_write_barrier
|
| - ? UseTempRegister(instr->key())
|
| - : UseRegisterOrConstantAtStart(instr->key());
|
| + LOperand* val;
|
| + LOperand* key;
|
| + if (needs_write_barrier) {
|
| + val = UseTempRegister(instr->value());
|
| + key = UseTempRegister(instr->key());
|
| + } else {
|
| + val = UseRegisterOrConstantAtStart(instr->value());
|
| + key = UseRegisterOrConstantAtStart(instr->key());
|
| + }
|
| return new(zone()) LStoreKeyed(obj, key, val);
|
| }
|
| }
|
| @@ -2403,9 +2405,22 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
|
| : UseRegisterAtStart(instr->object());
|
| }
|
|
|
| - LOperand* val = needs_write_barrier
|
| - ? UseTempRegister(instr->value())
|
| - : UseRegister(instr->value());
|
| + LOperand* val = NULL;
|
| + if (needs_write_barrier) {
|
| + val = UseTempRegister(instr->value());
|
| + } else if (instr->value()->IsConstant()) {
|
| + // If it's tagged, it might still be in new space
|
| + HConstant* constant_value = HConstant::cast(instr->value());
|
| + if (constant_value->HasInteger32Value() ||
|
| + constant_value->HasDoubleValue() ||
|
| + constant_value->ImmortalImmovable()) {
|
| + val = UseRegisterOrConstant(instr->value());
|
| + }
|
| + }
|
| +
|
| + if (val == NULL) {
|
| + val = UseRegister(instr->value());
|
| + }
|
|
|
| // We only need a scratch register if we have a write barrier or we
|
| // have a store into the properties array (not in-object-property).
|
| @@ -2476,6 +2491,7 @@ LInstruction* LChunkBuilder::DoAllocateObject(HAllocateObject* instr) {
|
| LInstruction* LChunkBuilder::DoAllocate(HAllocate* instr) {
|
| info()->MarkAsDeferredCalling();
|
| LOperand* context = UseAny(instr->context());
|
| + // TODO(mvstanton): why can't size be a constant if possible?
|
| LOperand* size = UseTempRegister(instr->size());
|
| LOperand* temp = TempRegister();
|
| LAllocate* result = new(zone()) LAllocate(context, size, temp);
|
| @@ -2537,7 +2553,12 @@ LInstruction* LChunkBuilder::DoParameter(HParameter* instr) {
|
| ASSERT(info()->IsStub());
|
| CodeStubInterfaceDescriptor* descriptor =
|
| info()->code_stub()->GetInterfaceDescriptor(info()->isolate());
|
| - Register reg = descriptor->register_params_[instr->index()];
|
| + Register reg;
|
| + if (static_cast<int>(instr->index()) == descriptor->register_param_count_) {
|
| + reg = *(descriptor->stack_parameter_count_);
|
| + } else {
|
| + reg = descriptor->register_params_[instr->index()];
|
| + }
|
| return DefineFixed(result, reg);
|
| }
|
| }
|
| @@ -2572,8 +2593,15 @@ LInstruction* LChunkBuilder::DoArgumentsObject(HArgumentsObject* instr) {
|
|
|
| LInstruction* LChunkBuilder::DoAccessArgumentsAt(HAccessArgumentsAt* instr) {
|
| LOperand* args = UseRegister(instr->arguments());
|
| - LOperand* length = UseTempRegister(instr->length());
|
| - LOperand* index = Use(instr->index());
|
| + LOperand* length;
|
| + LOperand* index;
|
| + if (instr->length()->IsConstant() && instr->index()->IsConstant()) {
|
| + length = UseRegisterOrConstant(instr->length());
|
| + index = UseOrConstant(instr->index());
|
| + } else {
|
| + length = UseTempRegister(instr->length());
|
| + index = Use(instr->index());
|
| + }
|
| return DefineAsRegister(new(zone()) LAccessArgumentsAt(args, length, index));
|
| }
|
|
|
|
|