| Index: src/ia32/lithium-ia32.cc
|
| diff --git a/src/ia32/lithium-ia32.cc b/src/ia32/lithium-ia32.cc
|
| index 52f39d4244debd6619a39a3a5f7d3b042bcd8874..2fa038baa49736ea188662e1a876d2cc68bb16b3 100644
|
| --- a/src/ia32/lithium-ia32.cc
|
| +++ b/src/ia32/lithium-ia32.cc
|
| @@ -487,7 +487,7 @@ LPlatformChunk* LChunkBuilder::Build() {
|
| }
|
|
|
|
|
| -void LChunkBuilder::Abort(BailoutReason reason) {
|
| +void LChunkBuilder::Abort(const char* reason) {
|
| info()->set_bailout_reason(reason);
|
| status_ = ABORTED;
|
| }
|
| @@ -698,7 +698,7 @@ LUnallocated* LChunkBuilder::TempRegister() {
|
| new(zone()) LUnallocated(LUnallocated::MUST_HAVE_REGISTER);
|
| int vreg = allocator_->GetVirtualRegister();
|
| if (!allocator_->AllocationOk()) {
|
| - Abort(kOutOfVirtualRegistersWhileTryingToAllocateTempRegister);
|
| + Abort("Out of virtual registers while trying to allocate temp register.");
|
| vreg = 0;
|
| }
|
| operand->set_virtual_register(vreg);
|
| @@ -1414,6 +1414,16 @@ LInstruction* LChunkBuilder::DoBitwise(HBitwise* instr) {
|
| }
|
|
|
|
|
| +LInstruction* LChunkBuilder::DoBitNot(HBitNot* instr) {
|
| + ASSERT(instr->value()->representation().IsInteger32());
|
| + ASSERT(instr->representation().IsInteger32());
|
| + if (instr->HasNoUses()) return NULL;
|
| + LOperand* input = UseRegisterAtStart(instr->value());
|
| + LBitNotI* result = new(zone()) LBitNotI(input);
|
| + return DefineSameAsFirst(result);
|
| +}
|
| +
|
| +
|
| LInstruction* LChunkBuilder::DoDiv(HDiv* instr) {
|
| if (instr->representation().IsDouble()) {
|
| return DoArithmeticD(Token::DIV, instr);
|
| @@ -1841,6 +1851,17 @@ LInstruction* LChunkBuilder::DoSeqStringSetChar(HSeqStringSetChar* instr) {
|
| }
|
|
|
|
|
| +LInstruction* LChunkBuilder::DoNumericConstraint(HNumericConstraint* instr) {
|
| + return NULL;
|
| +}
|
| +
|
| +
|
| +LInstruction* LChunkBuilder::DoInductionVariableAnnotation(
|
| + HInductionVariableAnnotation* instr) {
|
| + return NULL;
|
| +}
|
| +
|
| +
|
| LInstruction* LChunkBuilder::DoBoundsCheck(HBoundsCheck* instr) {
|
| return AssignEnvironment(new(zone()) LBoundsCheck(
|
| UseRegisterOrConstantAtStart(instr->index()),
|
| @@ -2028,6 +2049,15 @@ LInstruction* LChunkBuilder::DoCheckInstanceType(HCheckInstanceType* instr) {
|
| }
|
|
|
|
|
| +LInstruction* LChunkBuilder::DoCheckPrototypeMaps(HCheckPrototypeMaps* instr) {
|
| + LUnallocated* temp = NULL;
|
| + if (!instr->CanOmitPrototypeChecks()) temp = TempRegister();
|
| + LCheckPrototypeMaps* result = new(zone()) LCheckPrototypeMaps(temp);
|
| + if (instr->CanOmitPrototypeChecks()) return result;
|
| + return AssignEnvironment(result);
|
| +}
|
| +
|
| +
|
| LInstruction* LChunkBuilder::DoCheckFunction(HCheckFunction* instr) {
|
| // If the target is in new space, we'll emit a global cell compare and so
|
| // want the value in a register. If the target gets promoted before we
|
| @@ -2041,16 +2071,10 @@ LInstruction* LChunkBuilder::DoCheckFunction(HCheckFunction* instr) {
|
|
|
| LInstruction* LChunkBuilder::DoCheckMaps(HCheckMaps* instr) {
|
| LOperand* value = NULL;
|
| - if (!instr->CanOmitMapChecks()) {
|
| - value = UseRegisterAtStart(instr->value());
|
| - if (instr->has_migration_target()) info()->MarkAsDeferredCalling();
|
| - }
|
| + if (!instr->CanOmitMapChecks()) value = UseRegisterAtStart(instr->value());
|
| LCheckMaps* result = new(zone()) LCheckMaps(value);
|
| - if (!instr->CanOmitMapChecks()) {
|
| - AssignEnvironment(result);
|
| - if (instr->has_migration_target()) return AssignPointerMap(result);
|
| - }
|
| - return result;
|
| + if (instr->CanOmitMapChecks()) return result;
|
| + return AssignEnvironment(result);
|
| }
|
|
|
|
|
| @@ -2394,7 +2418,7 @@ LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) {
|
| bool is_external_location = instr->access().IsExternalMemory() &&
|
| instr->access().offset() == 0;
|
| bool needs_write_barrier = instr->NeedsWriteBarrier();
|
| - bool needs_write_barrier_for_map = instr->has_transition() &&
|
| + bool needs_write_barrier_for_map = !instr->transition().is_null() &&
|
| instr->NeedsWriteBarrierForMap();
|
|
|
| LOperand* obj;
|
| @@ -2543,7 +2567,7 @@ LInstruction* LChunkBuilder::DoParameter(HParameter* instr) {
|
| LInstruction* LChunkBuilder::DoUnknownOSRValue(HUnknownOSRValue* instr) {
|
| int spill_index = chunk()->GetNextSpillIndex(false); // Not double-width.
|
| if (spill_index > LUnallocated::kMaxFixedSlotIndex) {
|
| - Abort(kTooManySpillSlotsNeededForOSR);
|
| + Abort("Too many spill slots needed for OSR");
|
| spill_index = 0;
|
| }
|
| return DefineAsSpilled(new(zone()) LUnknownOSRValue, spill_index);
|
|
|