| Index: src/crankshaft/ia32/lithium-ia32.cc
|
| diff --git a/src/crankshaft/ia32/lithium-ia32.cc b/src/crankshaft/ia32/lithium-ia32.cc
|
| index 674eccade3b7bf5cedbe1ef001e3929e36213180..dcb9c626992b59c05377772cc14c839921eb472b 100644
|
| --- a/src/crankshaft/ia32/lithium-ia32.cc
|
| +++ b/src/crankshaft/ia32/lithium-ia32.cc
|
| @@ -2188,7 +2188,7 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) {
|
|
|
| if (!instr->is_fixed_typed_array()) {
|
| LOperand* obj = UseRegisterAtStart(instr->elements());
|
| - result = DefineAsRegister(new(zone()) LLoadKeyed(obj, key));
|
| + result = DefineAsRegister(new (zone()) LLoadKeyed(obj, key, nullptr));
|
| } else {
|
| DCHECK(
|
| (instr->representation().IsInteger32() &&
|
| @@ -2196,7 +2196,9 @@ LInstruction* LChunkBuilder::DoLoadKeyed(HLoadKeyed* instr) {
|
| (instr->representation().IsDouble() &&
|
| (IsDoubleOrFloatElementsKind(instr->elements_kind()))));
|
| LOperand* backing_store = UseRegister(instr->elements());
|
| - result = DefineAsRegister(new(zone()) LLoadKeyed(backing_store, key));
|
| + LOperand* backing_store_owner = UseAny(instr->backing_store_owner());
|
| + result = DefineAsRegister(
|
| + new (zone()) LLoadKeyed(backing_store, key, backing_store_owner));
|
| }
|
|
|
| bool needs_environment;
|
| @@ -2261,7 +2263,7 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
|
| LOperand* val = NULL;
|
| val = UseRegisterAtStart(instr->value());
|
| LOperand* key = UseRegisterOrConstantAtStart(instr->key());
|
| - return new(zone()) LStoreKeyed(object, key, val);
|
| + return new (zone()) LStoreKeyed(object, key, val, nullptr);
|
| } else {
|
| DCHECK(instr->value()->representation().IsSmiOrTagged());
|
| bool needs_write_barrier = instr->NeedsWriteBarrier();
|
| @@ -2276,7 +2278,7 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
|
| val = UseRegisterOrConstantAtStart(instr->value());
|
| key = UseRegisterOrConstantAtStart(instr->key());
|
| }
|
| - return new(zone()) LStoreKeyed(obj, key, val);
|
| + return new (zone()) LStoreKeyed(obj, key, val, nullptr);
|
| }
|
| }
|
|
|
| @@ -2289,13 +2291,14 @@ LInstruction* LChunkBuilder::DoStoreKeyed(HStoreKeyed* instr) {
|
| DCHECK(instr->elements()->representation().IsExternal());
|
|
|
| LOperand* backing_store = UseRegister(instr->elements());
|
| + LOperand* backing_store_owner = UseAny(instr->backing_store_owner());
|
| LOperand* val = GetStoreKeyedValueOperand(instr);
|
| bool clobbers_key = ExternalArrayOpRequiresTemp(
|
| instr->key()->representation(), elements_kind);
|
| LOperand* key = clobbers_key
|
| ? UseTempRegister(instr->key())
|
| : UseRegisterOrConstantAtStart(instr->key());
|
| - return new(zone()) LStoreKeyed(backing_store, key, val);
|
| + return new (zone()) LStoreKeyed(backing_store, key, val, backing_store_owner);
|
| }
|
|
|
|
|
|
|