| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index 59a5e5ba79efc38b5fbbfbf4c9e76a25d4cdc2f6..494784d72bf413e131bc15f561944b824dc6bf51 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2011 the V8 project authors. All rights reserved.
|
| +// Copyright 2012 the V8 project authors. All rights reserved.
|
| // Redistribution and use in source and binary forms, with or without
|
| // modification, are permitted provided that the following conditions are
|
| // met:
|
| @@ -1996,14 +1996,37 @@ void MacroAssembler::CheckMap(Register obj,
|
| Register scratch,
|
| Handle<Map> map,
|
| Label* fail,
|
| - SmiCheckType smi_check_type) {
|
| + SmiCheckType smi_check_type,
|
| + MapCheckMode mode) {
|
| if (smi_check_type == DO_SMI_CHECK) {
|
| JumpIfSmi(obj, fail);
|
| }
|
| +
|
| + Label success;
|
| ldr(scratch, FieldMemOperand(obj, HeapObject::kMapOffset));
|
| - mov(ip, Operand(map));
|
| - cmp(scratch, ip);
|
| + cmp(scratch, Operand(map));
|
| + if (mode == ALLOW_ELEMENT_TRANSITION_MAPS) {
|
| + bool ignore;
|
| + Map* transitioned_double_map =
|
| + map->LookupElementsTransitionMap(FAST_DOUBLE_ELEMENTS, &ignore);
|
| + ASSERT(transitioned_double_map == NULL ||
|
| + map->elements_kind() == FAST_SMI_ONLY_ELEMENTS);
|
| + Map* transitioned_fast_element_map =
|
| + map->LookupElementsTransitionMap(FAST_ELEMENTS, &ignore);
|
| + ASSERT(transitioned_fast_element_map == NULL ||
|
| + map->elements_kind() != FAST_ELEMENTS);
|
| + if (transitioned_fast_element_map != NULL) {
|
| + b(eq, &success);
|
| + cmp(scratch, Operand(Handle<Map>(transitioned_fast_element_map)));
|
| + }
|
| +
|
| + if (transitioned_double_map != NULL) {
|
| + b(eq, &success);
|
| + cmp(scratch, Operand(Handle<Map>(transitioned_double_map)));
|
| + }
|
| + }
|
| b(ne, fail);
|
| + bind(&success);
|
| }
|
|
|
|
|
|
|