| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index 19e622ad0f0d6964144751773a759c3b67767313..651d12593a35b9ca04ad9865a5875813a17abc13 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -402,7 +402,6 @@
|
| V(PROMISE_RESOLVE_THENABLE_JOB_INFO_TYPE) \
|
| V(PROMISE_REACTION_JOB_INFO_TYPE) \
|
| V(PROTOTYPE_INFO_TYPE) \
|
| - V(TUPLE2_TYPE) \
|
| V(TUPLE3_TYPE) \
|
| V(CONTEXT_EXTENSION_TYPE) \
|
| V(MODULE_TYPE) \
|
| @@ -570,7 +569,6 @@
|
| V(DEBUG_INFO, DebugInfo, debug_info) \
|
| V(BREAK_POINT_INFO, BreakPointInfo, break_point_info) \
|
| V(PROTOTYPE_INFO, PrototypeInfo, prototype_info) \
|
| - V(TUPLE2, Tuple2, tuple2) \
|
| V(TUPLE3, Tuple3, tuple3) \
|
| V(MODULE, Module, module) \
|
| V(MODULE_INFO_ENTRY, ModuleInfoEntry, module_info_entry) \
|
| @@ -750,7 +748,6 @@
|
| TRANSITION_ARRAY_TYPE,
|
| PROPERTY_CELL_TYPE,
|
| PROTOTYPE_INFO_TYPE,
|
| - TUPLE2_TYPE,
|
| TUPLE3_TYPE,
|
| CONTEXT_EXTENSION_TYPE,
|
| MODULE_TYPE,
|
| @@ -4028,20 +4025,18 @@
|
| // Type specific at put (default NONE attributes is used when adding).
|
| MUST_USE_RESULT static Handle<SeededNumberDictionary> AtNumberPut(
|
| Handle<SeededNumberDictionary> dictionary, uint32_t key,
|
| - Handle<Object> value, Handle<JSObject> dictionary_holder);
|
| + Handle<Object> value, bool used_as_prototype);
|
| MUST_USE_RESULT static Handle<SeededNumberDictionary> AddNumberEntry(
|
| Handle<SeededNumberDictionary> dictionary, uint32_t key,
|
| - Handle<Object> value, PropertyDetails details,
|
| - Handle<JSObject> dictionary_holder);
|
| + Handle<Object> value, PropertyDetails details, bool used_as_prototype);
|
|
|
| // Set an existing entry or add a new one if needed.
|
| // Return the updated dictionary.
|
| MUST_USE_RESULT static Handle<SeededNumberDictionary> Set(
|
| Handle<SeededNumberDictionary> dictionary, uint32_t key,
|
| - Handle<Object> value, PropertyDetails details,
|
| - Handle<JSObject> dictionary_holder);
|
| -
|
| - void UpdateMaxNumberKey(uint32_t key, Handle<JSObject> dictionary_holder);
|
| + Handle<Object> value, PropertyDetails details, bool used_as_prototype);
|
| +
|
| + void UpdateMaxNumberKey(uint32_t key, bool used_as_prototype);
|
|
|
| // Returns true if the dictionary contains any elements that are non-writable,
|
| // non-configurable, non-enumerable, or have getters/setters.
|
| @@ -6978,27 +6973,10 @@
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(PrototypeInfo);
|
| };
|
|
|
| -class Tuple2 : public Struct {
|
| +class Tuple3 : public Struct {
|
| public:
|
| DECL_ACCESSORS(value1, Object)
|
| DECL_ACCESSORS(value2, Object)
|
| -
|
| - DECLARE_CAST(Tuple2)
|
| -
|
| - // Dispatched behavior.
|
| - DECLARE_PRINTER(Tuple2)
|
| - DECLARE_VERIFIER(Tuple2)
|
| -
|
| - static const int kValue1Offset = HeapObject::kHeaderSize;
|
| - static const int kValue2Offset = kValue1Offset + kPointerSize;
|
| - static const int kSize = kValue2Offset + kPointerSize;
|
| -
|
| - private:
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(Tuple2);
|
| -};
|
| -
|
| -class Tuple3 : public Tuple2 {
|
| - public:
|
| DECL_ACCESSORS(value3, Object)
|
|
|
| DECLARE_CAST(Tuple3)
|
| @@ -7007,7 +6985,9 @@
|
| DECLARE_PRINTER(Tuple3)
|
| DECLARE_VERIFIER(Tuple3)
|
|
|
| - static const int kValue3Offset = Tuple2::kSize;
|
| + static const int kValue1Offset = HeapObject::kHeaderSize;
|
| + static const int kValue2Offset = kValue1Offset + kPointerSize;
|
| + static const int kValue3Offset = kValue2Offset + kPointerSize;
|
| static const int kSize = kValue3Offset + kPointerSize;
|
|
|
| private:
|
|
|