Index: src/x64/lithium-codegen-x64.cc |
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc |
index 19915425cf8b6808b59d7007bc5f42ed1ac839a0..bfeffd3f15f39cf9e6a7f7b7570d712f0e16c00f 100644 |
--- a/src/x64/lithium-codegen-x64.cc |
+++ b/src/x64/lithium-codegen-x64.cc |
@@ -69,12 +69,6 @@ void LCodeGen::FinishCode(Handle<Code> code) { |
} |
-void LChunkBuilder::Abort(BailoutReason reason) { |
- info()->set_bailout_reason(reason); |
- status_ = ABORTED; |
-} |
- |
- |
#ifdef _MSC_VER |
void LCodeGen::MakeSureStackPagesMapped(int offset) { |
const int kPageSize = 4 * KB; |
@@ -3996,7 +3990,6 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
} |
Register object = ToRegister(instr->object()); |
- Handle<Map> transition = instr->transition(); |
SmiCheck check_needed = hinstr->value()->IsHeapObject() |
? OMIT_SMI_CHECK : INLINE_SMI_CHECK; |
@@ -4020,15 +4013,17 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
} |
} |
} else if (representation.IsDouble()) { |
- ASSERT(transition.is_null()); |
ASSERT(access.IsInobject()); |
+ ASSERT(!hinstr->has_transition()); |
ASSERT(!hinstr->NeedsWriteBarrier()); |
XMMRegister value = ToDoubleRegister(instr->value()); |
__ movsd(FieldOperand(object, offset), value); |
return; |
} |
- if (!transition.is_null()) { |
+ if (hinstr->has_transition()) { |
+ Handle<Map> transition = hinstr->transition_map(); |
+ AddDeprecationDependency(transition); |
if (!hinstr->NeedsWriteBarrierForMap()) { |
__ Move(FieldOperand(object, HeapObject::kMapOffset), transition); |
} else { |