| Index: src/ia32/macro-assembler-ia32.cc
|
| diff --git a/src/ia32/macro-assembler-ia32.cc b/src/ia32/macro-assembler-ia32.cc
|
| index 3228e8370e1ea9848ddbe0885462234784e885ce..b80247af621219269f75a29080eda8409e44a1e6 100644
|
| --- a/src/ia32/macro-assembler-ia32.cc
|
| +++ b/src/ia32/macro-assembler-ia32.cc
|
| @@ -580,38 +580,21 @@ void MacroAssembler::StoreNumberToDoubleElements(
|
|
|
| void MacroAssembler::CompareMap(Register obj,
|
| Handle<Map> map,
|
| - Label* early_success,
|
| - CompareMapMode mode) {
|
| + Label* early_success) {
|
| cmp(FieldOperand(obj, HeapObject::kMapOffset), map);
|
| - if (mode == ALLOW_ELEMENT_TRANSITION_MAPS) {
|
| - ElementsKind kind = map->elements_kind();
|
| - if (IsFastElementsKind(kind)) {
|
| - bool packed = IsFastPackedElementsKind(kind);
|
| - Map* current_map = *map;
|
| - while (CanTransitionToMoreGeneralFastElementsKind(kind, packed)) {
|
| - kind = GetNextMoreGeneralFastElementsKind(kind, packed);
|
| - current_map = current_map->LookupElementsTransitionMap(kind);
|
| - if (!current_map) break;
|
| - j(equal, early_success, Label::kNear);
|
| - cmp(FieldOperand(obj, HeapObject::kMapOffset),
|
| - Handle<Map>(current_map));
|
| - }
|
| - }
|
| - }
|
| }
|
|
|
|
|
| void MacroAssembler::CheckMap(Register obj,
|
| Handle<Map> map,
|
| Label* fail,
|
| - SmiCheckType smi_check_type,
|
| - CompareMapMode mode) {
|
| + SmiCheckType smi_check_type) {
|
| if (smi_check_type == DO_SMI_CHECK) {
|
| JumpIfSmi(obj, fail);
|
| }
|
|
|
| Label success;
|
| - CompareMap(obj, map, &success, mode);
|
| + CompareMap(obj, map, &success);
|
| j(not_equal, fail);
|
| bind(&success);
|
| }
|
|
|