| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index 750ceb3612b5fcd9a130f4b788630a2616462395..ccc802d6f198e640e9ec283cb6f03bc4e9afea92 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -128,9 +128,7 @@
|
| // - SharedFunctionInfo
|
| // - Struct
|
| // - Box
|
| -// - DeclaredAccessorDescriptor
|
| // - AccessorInfo
|
| -// - DeclaredAccessorInfo
|
| // - ExecutableAccessorInfo
|
| // - AccessorPair
|
| // - AccessCheckInfo
|
| @@ -520,10 +518,6 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1;
|
| // manually.
|
| #define STRUCT_LIST(V) \
|
| V(BOX, Box, box) \
|
| - V(DECLARED_ACCESSOR_DESCRIPTOR, \
|
| - DeclaredAccessorDescriptor, \
|
| - declared_accessor_descriptor) \
|
| - V(DECLARED_ACCESSOR_INFO, DeclaredAccessorInfo, declared_accessor_info) \
|
| V(EXECUTABLE_ACCESSOR_INFO, ExecutableAccessorInfo, executable_accessor_info)\
|
| V(ACCESSOR_PAIR, AccessorPair, accessor_pair) \
|
| V(ACCESS_CHECK_INFO, AccessCheckInfo, access_check_info) \
|
| @@ -10405,115 +10399,6 @@ class AccessorInfo: public Struct {
|
| };
|
|
|
|
|
| -enum AccessorDescriptorType {
|
| - kDescriptorBitmaskCompare,
|
| - kDescriptorPointerCompare,
|
| - kDescriptorPrimitiveValue,
|
| - kDescriptorObjectDereference,
|
| - kDescriptorPointerDereference,
|
| - kDescriptorPointerShift,
|
| - kDescriptorReturnObject
|
| -};
|
| -
|
| -
|
| -struct BitmaskCompareDescriptor {
|
| - uint32_t bitmask;
|
| - uint32_t compare_value;
|
| - uint8_t size; // Must be in {1,2,4}.
|
| -};
|
| -
|
| -
|
| -struct PointerCompareDescriptor {
|
| - void* compare_value;
|
| -};
|
| -
|
| -
|
| -struct PrimitiveValueDescriptor {
|
| - v8::DeclaredAccessorDescriptorDataType data_type;
|
| - uint8_t bool_offset; // Must be in [0,7], used for kDescriptorBoolType.
|
| -};
|
| -
|
| -
|
| -struct ObjectDerefenceDescriptor {
|
| - uint8_t internal_field;
|
| -};
|
| -
|
| -
|
| -struct PointerShiftDescriptor {
|
| - int16_t byte_offset;
|
| -};
|
| -
|
| -
|
| -struct DeclaredAccessorDescriptorData {
|
| - AccessorDescriptorType type;
|
| - union {
|
| - struct BitmaskCompareDescriptor bitmask_compare_descriptor;
|
| - struct PointerCompareDescriptor pointer_compare_descriptor;
|
| - struct PrimitiveValueDescriptor primitive_value_descriptor;
|
| - struct ObjectDerefenceDescriptor object_dereference_descriptor;
|
| - struct PointerShiftDescriptor pointer_shift_descriptor;
|
| - };
|
| -};
|
| -
|
| -
|
| -class DeclaredAccessorDescriptor;
|
| -
|
| -
|
| -class DeclaredAccessorDescriptorIterator {
|
| - public:
|
| - explicit DeclaredAccessorDescriptorIterator(
|
| - DeclaredAccessorDescriptor* descriptor);
|
| - const DeclaredAccessorDescriptorData* Next();
|
| - bool Complete() const { return length_ == offset_; }
|
| - private:
|
| - uint8_t* array_;
|
| - const int length_;
|
| - int offset_;
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(DeclaredAccessorDescriptorIterator);
|
| -};
|
| -
|
| -
|
| -class DeclaredAccessorDescriptor: public Struct {
|
| - public:
|
| - DECL_ACCESSORS(serialized_data, ByteArray)
|
| -
|
| - DECLARE_CAST(DeclaredAccessorDescriptor)
|
| -
|
| - static Handle<DeclaredAccessorDescriptor> Create(
|
| - Isolate* isolate,
|
| - const DeclaredAccessorDescriptorData& data,
|
| - Handle<DeclaredAccessorDescriptor> previous);
|
| -
|
| - // Dispatched behavior.
|
| - DECLARE_PRINTER(DeclaredAccessorDescriptor)
|
| - DECLARE_VERIFIER(DeclaredAccessorDescriptor)
|
| -
|
| - static const int kSerializedDataOffset = HeapObject::kHeaderSize;
|
| - static const int kSize = kSerializedDataOffset + kPointerSize;
|
| -
|
| - private:
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(DeclaredAccessorDescriptor);
|
| -};
|
| -
|
| -
|
| -class DeclaredAccessorInfo: public AccessorInfo {
|
| - public:
|
| - DECL_ACCESSORS(descriptor, DeclaredAccessorDescriptor)
|
| -
|
| - DECLARE_CAST(DeclaredAccessorInfo)
|
| -
|
| - // Dispatched behavior.
|
| - DECLARE_PRINTER(DeclaredAccessorInfo)
|
| - DECLARE_VERIFIER(DeclaredAccessorInfo)
|
| -
|
| - static const int kDescriptorOffset = AccessorInfo::kSize;
|
| - static const int kSize = kDescriptorOffset + kPointerSize;
|
| -
|
| - private:
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(DeclaredAccessorInfo);
|
| -};
|
| -
|
| -
|
| // An accessor must have a getter, but can have no setter.
|
| //
|
| // When setting a property, V8 searches accessors in prototypes.
|
|
|