Index: src/x64/lithium-codegen-x64.cc |
diff --git a/src/x64/lithium-codegen-x64.cc b/src/x64/lithium-codegen-x64.cc |
index 7e482ee3fa363f42a69dd0f66f236bff274342da..4c7f02a855f7918b03d6b77152a8822ad26f4876 100644 |
--- a/src/x64/lithium-codegen-x64.cc |
+++ b/src/x64/lithium-codegen-x64.cc |
@@ -2975,6 +2975,7 @@ void LCodeGen::DoLoadNamedField(LLoadNamedField* instr) { |
Register object = ToRegister(instr->object()); |
if (instr->hydrogen()->representation().IsDouble()) { |
+ DCHECK(access.IsInobject()); |
XMMRegister result = ToDoubleRegister(instr->result()); |
__ movsd(result, FieldOperand(object, offset)); |
return; |
@@ -4121,7 +4122,7 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
DCHECK(!representation.IsSmi() || |
!instr->value()->IsConstantOperand() || |
IsInteger32Constant(LConstantOperand::cast(instr->value()))); |
- if (representation.IsDouble()) { |
+ if (!FLAG_unbox_double_fields && representation.IsDouble()) { |
DCHECK(access.IsInobject()); |
DCHECK(!hinstr->has_transition()); |
DCHECK(!hinstr->NeedsWriteBarrier()); |
@@ -4171,7 +4172,12 @@ void LCodeGen::DoStoreNamedField(LStoreNamedField* instr) { |
Operand operand = FieldOperand(write_register, offset); |
- if (instr->value()->IsRegister()) { |
+ if (FLAG_unbox_double_fields && representation.IsDouble()) { |
+ DCHECK(access.IsInobject()); |
+ XMMRegister value = ToDoubleRegister(instr->value()); |
+ __ movsd(operand, value); |
+ |
+ } else if (instr->value()->IsRegister()) { |
Register value = ToRegister(instr->value()); |
__ Store(operand, value, representation); |
} else { |