| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index d990dd3335d90f043070d71eedce893ead2d01b3..7d0791290bae786aad30f90f1ebe84b3cf50c533 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -2156,14 +2156,6 @@ class JSObject: public JSReceiver {
|
| StoreFromKeyed store_mode = MAY_BE_STORE_FROM_KEYED,
|
| ExecutableAccessorInfoHandling handling = DEFAULT_HANDLING);
|
|
|
| - static inline Handle<String> ExpectedTransitionKey(Handle<Map> map);
|
| - static inline Handle<Map> ExpectedTransitionTarget(Handle<Map> map);
|
| -
|
| - // Try to follow an existing transition to a field with attributes NONE. The
|
| - // return value indicates whether the transition was successful.
|
| - static inline Handle<Map> FindTransitionToField(Handle<Map> map,
|
| - Handle<Name> key);
|
| -
|
| // Extend the receiver with a single fast property appeared first in the
|
| // passed map. This also extends the property backing store if necessary.
|
| static void AllocateStorageForMap(Handle<JSObject> object, Handle<Map> map);
|
| @@ -6244,14 +6236,21 @@ class Map: public HeapObject {
|
| inline bool HasTransitionArray() const;
|
| inline bool HasElementsTransition();
|
| inline Map* elements_transition_map();
|
| - static Handle<TransitionArray> SetElementsTransitionMap(
|
| - Handle<Map> map, Handle<Map> transitioned_map);
|
| +
|
| inline Map* GetTransition(int transition_index);
|
| inline int SearchTransition(Name* name);
|
| inline FixedArrayBase* GetInitialElements();
|
|
|
| DECL_ACCESSORS(transitions, TransitionArray)
|
|
|
| + static inline Handle<String> ExpectedTransitionKey(Handle<Map> map);
|
| + static inline Handle<Map> ExpectedTransitionTarget(Handle<Map> map);
|
| +
|
| + // Try to follow an existing transition to a field with attributes NONE. The
|
| + // return value indicates whether the transition was successful.
|
| + static inline Handle<Map> FindTransitionToField(Handle<Map> map,
|
| + Handle<Name> key);
|
| +
|
| Map* FindRootMap();
|
| Map* FindFieldOwner(int descriptor);
|
|
|
| @@ -6259,15 +6258,17 @@ class Map: public HeapObject {
|
|
|
| int NumberOfFields();
|
|
|
| + // TODO(ishell): candidate with JSObject::MigrateToMap().
|
| bool InstancesNeedRewriting(Map* target,
|
| int target_number_of_fields,
|
| int target_inobject,
|
| int target_unused);
|
| + // TODO(ishell): moveit!
|
| static Handle<Map> GeneralizeAllFieldRepresentations(Handle<Map> map);
|
| - static Handle<HeapType> GeneralizeFieldType(Handle<HeapType> type1,
|
| - Handle<HeapType> type2,
|
| - Isolate* isolate)
|
| - V8_WARN_UNUSED_RESULT;
|
| + MUST_USE_RESULT static Handle<HeapType> GeneralizeFieldType(
|
| + Handle<HeapType> type1,
|
| + Handle<HeapType> type2,
|
| + Isolate* isolate);
|
| static void GeneralizeFieldType(Handle<Map> map,
|
| int modify_index,
|
| Handle<HeapType> new_field_type);
|
| @@ -6552,7 +6553,6 @@ class Map: public HeapObject {
|
| // elements_kind that's found in |candidates|, or null handle if no match is
|
| // found at all.
|
| Handle<Map> FindTransitionedMap(MapHandleList* candidates);
|
| - Map* FindTransitionedMap(MapList* candidates);
|
|
|
| bool CanTransition() {
|
| // Only JSObject and subtypes have map transitions and back pointers.
|
| @@ -6714,6 +6714,9 @@ class Map: public HeapObject {
|
| bool EquivalentToForNormalization(Map* other, PropertyNormalizationMode mode);
|
|
|
| private:
|
| + static Handle<TransitionArray> SetElementsTransitionMap(
|
| + Handle<Map> map, Handle<Map> transitioned_map);
|
| +
|
| bool EquivalentToForTransition(Map* other);
|
| static Handle<Map> RawCopy(Handle<Map> map, int instance_size);
|
| static Handle<Map> ShareDescriptor(Handle<Map> map,
|
|
|