| Index: src/ic/arm/handler-compiler-arm.cc
|
| diff --git a/src/ic/arm/handler-compiler-arm.cc b/src/ic/arm/handler-compiler-arm.cc
|
| index 3a0756a77b24d9fe1542c2ca9912b56a1fa58634..ae021cafe969a563d0a3f73c631bfab333aaec4d 100644
|
| --- a/src/ic/arm/handler-compiler-arm.cc
|
| +++ b/src/ic/arm/handler-compiler-arm.cc
|
| @@ -326,10 +326,23 @@ void NamedStoreHandlerCompiler::GenerateRestoreName(Label* label,
|
| }
|
|
|
|
|
| -void NamedStoreHandlerCompiler::GenerateRestoreNameAndMap(
|
| - Handle<Name> name, Handle<Map> transition) {
|
| +void NamedStoreHandlerCompiler::GenerateRestoreName(Handle<Name> name) {
|
| __ mov(this->name(), Operand(name));
|
| - __ mov(StoreTransitionDescriptor::MapRegister(), Operand(transition));
|
| +}
|
| +
|
| +
|
| +void NamedStoreHandlerCompiler::GenerateRestoreMap(Handle<Map> transition,
|
| + Register scratch,
|
| + Label* miss) {
|
| + Handle<WeakCell> cell = Map::WeakCellForMap(transition);
|
| + Register map_reg = StoreTransitionDescriptor::MapRegister();
|
| + DCHECK(!map_reg.is(scratch));
|
| + __ LoadWeakValue(map_reg, cell, miss);
|
| + if (transition->CanBeDeprecated()) {
|
| + __ ldr(scratch, FieldMemOperand(map_reg, Map::kBitField3Offset));
|
| + __ tst(scratch, Operand(Map::Deprecated::kMask));
|
| + __ b(ne, miss);
|
| + }
|
| }
|
|
|
|
|
|
|