Index: src/hydrogen.cc |
diff --git a/src/hydrogen.cc b/src/hydrogen.cc |
index 6f63b76ba97693cdea6946ec98e6004a191f7b37..c61a342acb195de3cd588dda2cf887c27373c527 100644 |
--- a/src/hydrogen.cc |
+++ b/src/hydrogen.cc |
@@ -7142,7 +7142,8 @@ HInstruction* HOptimizedGraphBuilder::BuildMonomorphicElementAccess( |
static bool CanInlineElementAccess(Handle<Map> map) { |
- return map->IsJSObjectMap() && !map->has_slow_elements_kind() && |
+ return map->IsJSObjectMap() && !map->has_dictionary_elements() && |
+ !map->has_sloppy_arguments_elements() && |
!map->has_indexed_interceptor() && !map->is_access_check_needed(); |
} |
@@ -7248,7 +7249,7 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess( |
elements_kind != GetInitialFastElementsKind()) { |
possible_transitioned_maps.Add(map); |
} |
- if (elements_kind == SLOPPY_ARGUMENTS_ELEMENTS) { |
+ if (IsSloppyArgumentsElements(elements_kind)) { |
HInstruction* result = BuildKeyedGeneric(access_type, expr, object, key, |
val); |
*has_side_effects = result->HasObservableSideEffects(); |
@@ -7259,7 +7260,7 @@ HValue* HOptimizedGraphBuilder::HandlePolymorphicElementAccess( |
for (int i = 0; i < maps->length(); ++i) { |
Handle<Map> map = maps->at(i); |
Handle<Map> transitioned_map = |
- map->FindTransitionedMap(&possible_transitioned_maps); |
+ Map::FindTransitionedMap(map, &possible_transitioned_maps); |
transition_target.Add(transitioned_map); |
} |