| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index 70e219390964376ad583cc952b9d61d87fe6a58b..9a2bb7ce370bbea27712fc488e316c26ece2a7b8 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -1826,8 +1826,8 @@ class JSObject: public JSReceiver {
|
| inline bool HasFixedFloat32Elements();
|
| inline bool HasFixedFloat64Elements();
|
|
|
| - bool HasFastArgumentsElements();
|
| - bool HasDictionaryArgumentsElements();
|
| + inline bool HasFastArgumentsElements();
|
| + inline bool HasSlowArgumentsElements();
|
| inline SeededNumberDictionary* element_dictionary(); // Gets slow elements.
|
|
|
| // Requires: HasFastElements().
|
| @@ -5702,7 +5702,7 @@ class Map: public HeapObject {
|
| }
|
|
|
| inline bool has_sloppy_arguments_elements() {
|
| - return elements_kind() == SLOPPY_ARGUMENTS_ELEMENTS;
|
| + return IsSloppyArgumentsElements(elements_kind());
|
| }
|
|
|
| inline bool has_external_array_elements() {
|
| @@ -5717,11 +5717,6 @@ class Map: public HeapObject {
|
| return IsDictionaryElementsKind(elements_kind());
|
| }
|
|
|
| - inline bool has_slow_elements_kind() {
|
| - return elements_kind() == DICTIONARY_ELEMENTS
|
| - || elements_kind() == SLOPPY_ARGUMENTS_ELEMENTS;
|
| - }
|
| -
|
| static bool IsValidElementsTransition(ElementsKind from_kind,
|
| ElementsKind to_kind);
|
|
|
| @@ -6046,7 +6041,8 @@ class Map: public HeapObject {
|
| // Returns the transitioned map for this map with the most generic
|
| // elements_kind that's found in |candidates|, or null handle if no match is
|
| // found at all.
|
| - Handle<Map> FindTransitionedMap(MapHandleList* candidates);
|
| + static Handle<Map> FindTransitionedMap(Handle<Map> map,
|
| + MapHandleList* candidates);
|
|
|
| bool CanTransition() {
|
| // Only JSObject and subtypes have map transitions and back pointers.
|
|
|