| Index: src/ic/keyed-store-generic.cc | 
| diff --git a/src/ic/keyed-store-generic.cc b/src/ic/keyed-store-generic.cc | 
| index 63b85ea564423c3d4a25afa8724a0a95ce590cfc..c30847c0a07d1d2a6e85efdd18af52d1765b06e5 100644 | 
| --- a/src/ic/keyed-store-generic.cc | 
| +++ b/src/ic/keyed-store-generic.cc | 
| @@ -118,7 +118,7 @@ void KeyedStoreGenericAssembler::TryRewriteElements( | 
| TrapAllocationMemento(receiver, bailout); | 
| } | 
| Label perform_transition(this), check_holey_map(this); | 
| -  Variable var_target_map(this, MachineType::PointerRepresentation()); | 
| +  Variable var_target_map(this, MachineRepresentation::kTagged); | 
| // Check if the receiver has the default |from_kind| map. | 
| { | 
| Node* packed_map = | 
| @@ -534,7 +534,7 @@ void KeyedStoreGenericAssembler::LookupPropertyOnPrototypeChain( | 
| DescriptorArray::kDescriptorKey) * | 
| kPointerSize; | 
| Node* details = LoadAndUntagToWord32FixedArrayElement( | 
| -            descriptors, name_index, kNameToDetailsOffset); | 
| +            descriptors, name_index, kNameToDetailsOffset, INTPTR_PARAMETERS); | 
| JumpIfDataProperty(details, &ok_to_write, readonly); | 
|  | 
| // Accessor case. | 
| @@ -553,15 +553,15 @@ void KeyedStoreGenericAssembler::LookupPropertyOnPrototypeChain( | 
| NameDictionary::kEntryKeyIndex) * | 
| kPointerSize; | 
| Node* details = LoadAndUntagToWord32FixedArrayElement( | 
| -            dictionary, entry, kNameToDetailsOffset); | 
| +            dictionary, entry, kNameToDetailsOffset, INTPTR_PARAMETERS); | 
| JumpIfDataProperty(details, &ok_to_write, readonly); | 
|  | 
| // Accessor case. | 
| const int kNameToValueOffset = (NameDictionary::kEntryValueIndex - | 
| NameDictionary::kEntryKeyIndex) * | 
| kPointerSize; | 
| -        var_accessor_pair->Bind( | 
| -            LoadFixedArrayElement(dictionary, entry, kNameToValueOffset)); | 
| +        var_accessor_pair->Bind(LoadFixedArrayElement( | 
| +            dictionary, entry, kNameToValueOffset, INTPTR_PARAMETERS)); | 
| var_accessor_holder->Bind(holder); | 
| Goto(accessor); | 
| } | 
| @@ -574,8 +574,8 @@ void KeyedStoreGenericAssembler::LookupPropertyOnPrototypeChain( | 
| GlobalDictionary::kEntryKeyIndex) * | 
| kPointerSize; | 
|  | 
| -        Node* property_cell = | 
| -            LoadFixedArrayElement(dictionary, entry, kNameToValueOffset); | 
| +        Node* property_cell = LoadFixedArrayElement( | 
| +            dictionary, entry, kNameToValueOffset, INTPTR_PARAMETERS); | 
|  | 
| Node* value = | 
| LoadObjectField(property_cell, PropertyCell::kValueOffset); | 
| @@ -641,15 +641,17 @@ void KeyedStoreGenericAssembler::EmitGenericPropertyStore( | 
| NameDictionary::kEntryKeyIndex) * | 
| kPointerSize; | 
| Node* details = LoadAndUntagToWord32FixedArrayElement( | 
| -          properties, var_name_index.value(), kNameToDetailsOffset); | 
| +          properties, var_name_index.value(), kNameToDetailsOffset, | 
| +          INTPTR_PARAMETERS); | 
| JumpIfDataProperty(details, &overwrite, &readonly); | 
|  | 
| // Accessor case. | 
| const int kNameToValueOffset = | 
| (NameDictionary::kEntryValueIndex - NameDictionary::kEntryKeyIndex) * | 
| kPointerSize; | 
| -      var_accessor_pair.Bind(LoadFixedArrayElement( | 
| -          properties, var_name_index.value(), kNameToValueOffset)); | 
| +      var_accessor_pair.Bind( | 
| +          LoadFixedArrayElement(properties, var_name_index.value(), | 
| +                                kNameToValueOffset, INTPTR_PARAMETERS)); | 
| var_accessor_holder.Bind(receiver); | 
| Goto(&accessor); | 
|  | 
|  |