| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index f800c5d580eace363c14b94ac947af8cec798fc7..a0c76c8b7fc9caa0451a3f80bd5c1f11aeed7302 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -3179,6 +3179,12 @@ class DescriptorArray: public FixedArray {
|
| inline void Append(Descriptor* desc, const WhitenessWitness&);
|
| inline void Append(Descriptor* desc);
|
|
|
| + // Append a NeaderArray of descriptor.
|
| + // Returns the new value of valid_descriptors.
|
| + static int AppendDescriptors(Handle<DescriptorArray> array,
|
| + int valid_descriptors,
|
| + Handle<Object> descriptors);
|
| +
|
| // Transfer a complete descriptor from the src descriptor array to this
|
| // descriptor array.
|
| void CopyFrom(int dst_index,
|
| @@ -9803,12 +9809,15 @@ class TemplateInfo: public Struct {
|
| public:
|
| DECL_ACCESSORS(tag, Object)
|
| DECL_ACCESSORS(property_list, Object)
|
| + DECL_ACCESSORS(property_accessors, Object)
|
|
|
| DECLARE_VERIFIER(TemplateInfo)
|
|
|
| - static const int kTagOffset = HeapObject::kHeaderSize;
|
| + static const int kTagOffset = HeapObject::kHeaderSize;
|
| static const int kPropertyListOffset = kTagOffset + kPointerSize;
|
| - static const int kHeaderSize = kPropertyListOffset + kPointerSize;
|
| + static const int kPropertyAccessorsOffset =
|
| + kPropertyListOffset + kPointerSize;
|
| + static const int kHeaderSize = kPropertyAccessorsOffset + kPointerSize;
|
|
|
| private:
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(TemplateInfo);
|
| @@ -9819,7 +9828,6 @@ class FunctionTemplateInfo: public TemplateInfo {
|
| public:
|
| DECL_ACCESSORS(serial_number, Object)
|
| DECL_ACCESSORS(call_code, Object)
|
| - DECL_ACCESSORS(property_accessors, Object)
|
| DECL_ACCESSORS(prototype_template, Object)
|
| DECL_ACCESSORS(parent_template, Object)
|
| DECL_ACCESSORS(named_property_handler, Object)
|
| @@ -9850,9 +9858,8 @@ class FunctionTemplateInfo: public TemplateInfo {
|
|
|
| static const int kSerialNumberOffset = TemplateInfo::kHeaderSize;
|
| static const int kCallCodeOffset = kSerialNumberOffset + kPointerSize;
|
| - static const int kPropertyAccessorsOffset = kCallCodeOffset + kPointerSize;
|
| static const int kPrototypeTemplateOffset =
|
| - kPropertyAccessorsOffset + kPointerSize;
|
| + kCallCodeOffset + kPointerSize;
|
| static const int kParentTemplateOffset =
|
| kPrototypeTemplateOffset + kPointerSize;
|
| static const int kNamedPropertyHandlerOffset =
|
|
|