Index: src/arm/lithium-arm.cc |
diff --git a/src/arm/lithium-arm.cc b/src/arm/lithium-arm.cc |
index 43f0fd32931fd9660a681e70ca8ee54babc3e345..1857b4a47c524f19fddbbb3d23174efb1848407f 100644 |
--- a/src/arm/lithium-arm.cc |
+++ b/src/arm/lithium-arm.cc |
@@ -437,7 +437,7 @@ LPlatformChunk* LChunkBuilder::Build() { |
} |
-void LChunkBuilder::Abort(BailoutReason reason) { |
+void LChunkBuilder::Abort(const char* reason) { |
info()->set_bailout_reason(reason); |
status_ = ABORTED; |
} |
@@ -645,7 +645,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); |
@@ -1325,6 +1325,15 @@ 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* value = UseRegisterAtStart(instr->value()); |
+ return DefineAsRegister(new(zone()) LBitNotI(value)); |
+} |
+ |
+ |
LInstruction* LChunkBuilder::DoDiv(HDiv* instr) { |
if (instr->representation().IsDouble()) { |
return DoArithmeticD(Token::DIV, instr); |
@@ -1823,6 +1832,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) { |
LOperand* value = UseRegisterOrConstantAtStart(instr->index()); |
LOperand* length = UseRegister(instr->length()); |
@@ -1996,6 +2016,19 @@ LInstruction* LChunkBuilder::DoCheckInstanceType(HCheckInstanceType* instr) { |
} |
+LInstruction* LChunkBuilder::DoCheckPrototypeMaps(HCheckPrototypeMaps* instr) { |
+ LUnallocated* temp1 = NULL; |
+ LOperand* temp2 = NULL; |
+ if (!instr->CanOmitPrototypeChecks()) { |
+ temp1 = TempRegister(); |
+ temp2 = TempRegister(); |
+ } |
+ LCheckPrototypeMaps* result = new(zone()) LCheckPrototypeMaps(temp1, temp2); |
+ if (instr->CanOmitPrototypeChecks()) return result; |
+ return AssignEnvironment(result); |
+} |
+ |
+ |
LInstruction* LChunkBuilder::DoCheckFunction(HCheckFunction* instr) { |
LOperand* value = UseRegisterAtStart(instr->value()); |
return AssignEnvironment(new(zone()) LCheckFunction(value)); |
@@ -2004,16 +2037,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(); |
- } |
- LCheckMaps* result = new(zone()) LCheckMaps(value); |
- if (!instr->CanOmitMapChecks()) { |
- AssignEnvironment(result); |
- if (instr->has_migration_target()) return AssignPointerMap(result); |
- } |
- return result; |
+ if (!instr->CanOmitMapChecks()) value = UseRegisterAtStart(instr->value()); |
+ LInstruction* result = new(zone()) LCheckMaps(value); |
+ if (instr->CanOmitMapChecks()) return result; |
+ return AssignEnvironment(result); |
} |
@@ -2295,7 +2322,7 @@ LInstruction* LChunkBuilder::DoTrapAllocationMemento( |
LInstruction* LChunkBuilder::DoStoreNamedField(HStoreNamedField* instr) { |
bool is_in_object = instr->access().IsInobject(); |
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; |
@@ -2415,7 +2442,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); |