src/objects.h - Issue 149133004: A64: Synchronize with r17807.

Unified Diff: src/objects.h

Issue 149133004: A64: Synchronize with r17807. (Closed) Base URL: https://v8.googlecode.com/svn/branches/experimental/a64

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: src/objects.h

diff --git a/src/objects.h b/src/objects.h

index 654034d3c2ab5d475b8466a7888ad1ec1fc44cca..54a6ab41e975edd5f6672c37c93fcb300af4bb95 100644

--- a/src/objects.h

+++ b/src/objects.h

@@ -354,6 +354,7 @@ const int kStubMinorKeyBits = kBitsPerInt - kSmiTagSize - kStubMajorKeyBits;

V(SHORT_EXTERNAL_INTERNALIZED_STRING_WITH_ONE_BYTE_DATA_TYPE) \

V(SYMBOL_TYPE) \

+ \

V(MAP_TYPE) \

V(CODE_TYPE) \

V(ODDBALL_TYPE) \

@@ -686,7 +687,7 @@ enum InstanceType {

| kNotInternalizedTag,

// Non-string names

- SYMBOL_TYPE = kNotStringTag, // LAST_NAME_TYPE, FIRST_NONSTRING_TYPE

+ SYMBOL_TYPE = kNotStringTag, // FIRST_NONSTRING_TYPE, LAST_NAME_TYPE

// Objects allocated in their own spaces (never in new space).

MAP_TYPE,

@@ -1534,6 +1535,7 @@ class Object : public MaybeObject {

// Return the object's prototype (might be Heap::null_value()).

Object* GetPrototype(Isolate* isolate);

+ Map* GetMarkerMap(Isolate* isolate);

// Returns the permanent hash code associated with this object. May return

// undefined if not yet created.

@@ -2378,24 +2380,10 @@ class JSObject: public JSReceiver {

AccessorPair* GetLocalPropertyAccessorPair(Name* name);

AccessorPair* GetLocalElementAccessorPair(uint32_t index);

- MUST_USE_RESULT MaybeObject* SetFastElement(uint32_t index,

- Object* value,

- StrictModeFlag strict_mode,

- bool check_prototype);

- MUST_USE_RESULT MaybeObject* SetDictionaryElement(

- uint32_t index,

- Object* value,

- PropertyAttributes attributes,

- StrictModeFlag strict_mode,

- bool check_prototype,

- SetPropertyMode set_mode = SET_PROPERTY);

- MUST_USE_RESULT MaybeObject* SetFastDoubleElement(

- uint32_t index,

- Object* value,

- StrictModeFlag strict_mode,

- bool check_prototype = true);

+ static Handle<Object> SetFastElement(Handle<JSObject> object, uint32_t index,

+ Handle<Object> value,

+ StrictModeFlag strict_mode,

+ bool check_prototype);

static Handle<Object> SetOwnElement(Handle<JSObject> object,

uint32_t index,

@@ -2407,15 +2395,6 @@ class JSObject: public JSReceiver {

Handle<JSObject> object,

uint32_t index,

Handle<Object> value,

- PropertyAttributes attr,

- StrictModeFlag strict_mode,

- bool check_prototype = true,

- SetPropertyMode set_mode = SET_PROPERTY);

- // A Failure object is returned if GC is needed.

- MUST_USE_RESULT MaybeObject* SetElement(

- uint32_t index,

- Object* value,

PropertyAttributes attributes,

StrictModeFlag strict_mode,

bool check_prototype = true,

@@ -2432,6 +2411,11 @@ class JSObject: public JSReceiver {

kDontAllowSmiElements

};

+ static Handle<FixedArray> SetFastElementsCapacityAndLength(

+ Handle<JSObject> object,

+ int capacity,

+ int length,

+ SetFastElementsCapacitySmiMode smi_mode);

// Replace the elements' backing store with fast elements of the given

// capacity. Update the length for JSArrays. Returns the new backing

// store.

@@ -2439,6 +2423,10 @@ class JSObject: public JSReceiver {

int capacity,

int length,

SetFastElementsCapacitySmiMode smi_mode);

+ static void SetFastDoubleElementsCapacityAndLength(

+ Handle<JSObject> object,

+ int capacity,

+ int length);

MUST_USE_RESULT MaybeObject* SetFastDoubleElementsCapacityAndLength(

int capacity,

int length);

@@ -2508,7 +2496,6 @@ class JSObject: public JSReceiver {

ElementsKind to_kind);

MUST_USE_RESULT MaybeObject* TransitionElementsKind(ElementsKind to_kind);

- MUST_USE_RESULT MaybeObject* UpdateAllocationSite(ElementsKind to_kind);

// TODO(mstarzinger): Both public because of ConvertAnsSetLocalProperty().

static void MigrateToMap(Handle<JSObject> object, Handle<Map> new_map);

@@ -2699,6 +2686,10 @@ class JSObject: public JSReceiver {

friend class JSReceiver;

friend class Object;

+ static void UpdateAllocationSite(Handle<JSObject> object,

+ ElementsKind to_kind);

+ MUST_USE_RESULT MaybeObject* UpdateAllocationSite(ElementsKind to_kind);

// Used from Object::GetProperty().

static Handle<Object> GetPropertyWithFailedAccessCheck(

Handle<JSObject> object,

@@ -2726,25 +2717,42 @@ class JSObject: public JSReceiver {

Handle<Object> value,

Handle<JSObject> holder,

StrictModeFlag strict_mode);

- MUST_USE_RESULT MaybeObject* SetElementWithInterceptor(

+ static Handle<Object> SetElementWithInterceptor(

+ Handle<JSObject> object,

uint32_t index,

- Object* value,

+ Handle<Object> value,

PropertyAttributes attributes,

StrictModeFlag strict_mode,

bool check_prototype,

SetPropertyMode set_mode);

- MUST_USE_RESULT MaybeObject* SetElementWithoutInterceptor(

+ static Handle<Object> SetElementWithoutInterceptor(

+ Handle<JSObject> object,

uint32_t index,

- Object* value,

+ Handle<Object> value,

PropertyAttributes attributes,

StrictModeFlag strict_mode,

bool check_prototype,

SetPropertyMode set_mode);

- MUST_USE_RESULT MaybeObject* SetElementWithCallbackSetterInPrototypes(

+ static Handle<Object> SetElementWithCallbackSetterInPrototypes(

+ Handle<JSObject> object,

uint32_t index,

- Object* value,

+ Handle<Object> value,

bool* found,

StrictModeFlag strict_mode);

+ static Handle<Object> SetDictionaryElement(

+ Handle<JSObject> object,

+ uint32_t index,

+ Handle<Object> value,

+ PropertyAttributes attributes,

+ StrictModeFlag strict_mode,

+ bool check_prototype,

+ SetPropertyMode set_mode = SET_PROPERTY);

+ static Handle<Object> SetFastDoubleElement(

+ Handle<JSObject> object,

+ uint32_t index,

+ Handle<Object> value,

+ StrictModeFlag strict_mode,

+ bool check_prototype = true);

// Searches the prototype chain for property 'name'. If it is found and

// has a setter, invoke it and set '*done' to true. If it is found and is

@@ -4006,6 +4014,11 @@ class SeededNumberDictionary

// Type specific at put (default NONE attributes is used when adding).

MUST_USE_RESULT MaybeObject* AtNumberPut(uint32_t key, Object* value);

+ MUST_USE_RESULT static Handle<SeededNumberDictionary> AddNumberEntry(

+ Handle<SeededNumberDictionary> dictionary,

+ uint32_t key,

+ Handle<Object> value,

+ PropertyDetails details);

MUST_USE_RESULT MaybeObject* AddNumberEntry(uint32_t key,

Object* value,

PropertyDetails details);

@@ -4630,6 +4643,10 @@ class ExternalByteArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, int8_t value);

+ static Handle<Object> SetValue(Handle<ExternalByteArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -4653,6 +4670,10 @@ class ExternalUnsignedByteArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, uint8_t value);

+ static Handle<Object> SetValue(Handle<ExternalUnsignedByteArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -4676,6 +4697,10 @@ class ExternalShortArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, int16_t value);

+ static Handle<Object> SetValue(Handle<ExternalShortArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -4699,6 +4724,10 @@ class ExternalUnsignedShortArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, uint16_t value);

+ static Handle<Object> SetValue(Handle<ExternalUnsignedShortArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -4722,6 +4751,10 @@ class ExternalIntArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, int32_t value);

+ static Handle<Object> SetValue(Handle<ExternalIntArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -4745,6 +4778,10 @@ class ExternalUnsignedIntArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, uint32_t value);

+ static Handle<Object> SetValue(Handle<ExternalUnsignedIntArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -4768,6 +4805,10 @@ class ExternalFloatArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, float value);

+ static Handle<Object> SetValue(Handle<ExternalFloatArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -4791,6 +4832,10 @@ class ExternalDoubleArray: public ExternalArray {

MUST_USE_RESULT inline MaybeObject* get(int index);

inline void set(int index, double value);

+ static Handle<Object> SetValue(Handle<ExternalDoubleArray> array,

+ uint32_t index,

+ Handle<Object> value);

// This accessor applies the correct conversion from Smi, HeapNumber

// and undefined.

MUST_USE_RESULT MaybeObject* SetValue(uint32_t index, Object* value);

@@ -5293,9 +5338,9 @@ class Code: public HeapObject {

static inline Flags ComputeMonomorphicFlags(

Kind kind,

ExtraICState extra_ic_state = kNoExtraICState,

+ InlineCacheHolderFlag holder = OWN_MAP,

StubType type = NORMAL,

- int argc = -1,

- InlineCacheHolderFlag holder = OWN_MAP);

+ int argc = -1);

static inline InlineCacheState ExtractICStateFromFlags(Flags flags);

static inline StubType ExtractTypeFromFlags(Flags flags);

@@ -5605,7 +5650,13 @@ class DependentCode: public FixedArray {

// Group of code that depends on global property values in property cells

// not being changed.

kPropertyCellChangedGroup,

- kGroupCount = kPropertyCellChangedGroup + 1

+ // Group of code that depends on tenuring information in AllocationSites

+ // not being changed.

+ kAllocationSiteTenuringChangedGroup,

+ // Group of code that depends on element transition information in

+ // AllocationSites not being changed.

+ kAllocationSiteTransitionChangedGroup,

+ kGroupCount = kAllocationSiteTransitionChangedGroup + 1

};

// Array for holding the index of the first code object of each group.

@@ -5705,7 +5756,7 @@ class Map: public HeapObject {

class FunctionWithPrototype: public BitField<bool, 23, 1> {};

class DictionaryMap: public BitField<bool, 24, 1> {};

class OwnsDescriptors: public BitField<bool, 25, 1> {};

- class IsObserved: public BitField<bool, 26, 1> {};

+ class HasInstanceCallHandler: public BitField<bool, 26, 1> {};

class Deprecated: public BitField<bool, 27, 1> {};

class IsFrozen: public BitField<bool, 28, 1> {};

class IsUnstable: public BitField<bool, 29, 1> {};

@@ -5768,12 +5819,12 @@ class Map: public HeapObject {

}

// Tells whether the instance has a call-as-function handler.

- inline void set_has_instance_call_handler() {

- set_bit_field(bit_field() | (1 << kHasInstanceCallHandler));

+ inline void set_is_observed() {

+ set_bit_field(bit_field() | (1 << kIsObserved));

}

- inline bool has_instance_call_handler() {

- return ((1 << kHasInstanceCallHandler) & bit_field()) != 0;

+ inline bool is_observed() {

+ return ((1 << kIsObserved) & bit_field()) != 0;

}

inline void set_is_extensible(bool value);

@@ -5782,10 +5833,6 @@ class Map: public HeapObject {

inline void set_elements_kind(ElementsKind elements_kind) {

ASSERT(elements_kind < kElementsKindCount);

ASSERT(kElementsKindCount <= (1 << kElementsKindBitCount));

- ASSERT(!is_observed() ||

- elements_kind == DICTIONARY_ELEMENTS ||

- elements_kind == NON_STRICT_ARGUMENTS_ELEMENTS ||

- IsExternalArrayElementsKind(elements_kind));

set_bit_field2((bit_field2() & ~kElementsKindMask) |

(elements_kind << kElementsKindShift));

ASSERT(this->elements_kind() == elements_kind);

@@ -6038,8 +6085,8 @@ class Map: public HeapObject {

inline bool owns_descriptors();

inline void set_owns_descriptors(bool is_shared);

- inline bool is_observed();

- inline void set_is_observed(bool is_observed);

+ inline bool has_instance_call_handler();

+ inline void set_has_instance_call_handler();

inline void freeze();

inline bool is_frozen();

inline void mark_unstable();

@@ -6298,7 +6345,7 @@ class Map: public HeapObject {

static const int kHasNamedInterceptor = 3;

static const int kHasIndexedInterceptor = 4;

static const int kIsUndetectable = 5;

- static const int kHasInstanceCallHandler = 6;

+ static const int kIsObserved = 6;

static const int kIsAccessCheckNeeded = 7;

// Bit positions for bit field 2

@@ -6822,6 +6869,9 @@ class SharedFunctionInfo: public HeapObject {

// global object.

DECL_BOOLEAN_ACCESSORS(native)

+ // Indicate that this builtin needs to be inlined in crankshaft.

+ DECL_BOOLEAN_ACCESSORS(inline_builtin)

// Indicates that the function was created by the Function function.

// Though it's anonymous, toString should treat it as if it had the name

// "anonymous". We don't set the name itself so that the system does not

@@ -6911,6 +6961,9 @@ class SharedFunctionInfo: public HeapObject {

set_dont_optimize(reason != kNoReason);

}

+ // Check whether or not this function is inlineable.

+ bool IsInlineable();

// Source size of this function.

int SourceSize();

@@ -7061,6 +7114,7 @@ class SharedFunctionInfo: public HeapObject {

kUsesArguments,

kHasDuplicateParameters,

kNative,

+ kInlineBuiltin,

kBoundFunction,

kIsAnonymous,

kNameShouldPrintAsAnonymous,

@@ -7287,9 +7341,6 @@ class JSFunction: public JSObject {

// Tells whether or not the function is on the concurrent recompilation queue.

inline bool IsInRecompileQueue();

- // Check whether or not this function is inlineable.

- bool IsInlineable();

// [literals_or_bindings]: Fixed array holding either

// the materialized literals or the bindings of a bound function.

@@ -8123,13 +8174,31 @@ class AllocationSite: public Struct {

// This method is expensive, it should only be called for reporting.

bool IsNestedSite();

+ class ElementsKindBits: public BitField<ElementsKind, 0, 15> {};

+ class UnusedBits: public BitField<int, 15, 14> {};

+ class DoNotInlineBit: public BitField<bool, 29, 1> {};

ElementsKind GetElementsKind() {

ASSERT(!SitePointsToLiteral());

- return static_cast<ElementsKind>(Smi::cast(transition_info())->value());

+ int value = Smi::cast(transition_info())->value();

+ return ElementsKindBits::decode(value);

}

void SetElementsKind(ElementsKind kind) {

- set_transition_info(Smi::FromInt(static_cast<int>(kind)));

+ int value = Smi::cast(transition_info())->value();

+ set_transition_info(Smi::FromInt(ElementsKindBits::update(value, kind)),

+ SKIP_WRITE_BARRIER);

+ }

+ bool CanInlineCall() {

+ int value = Smi::cast(transition_info())->value();

+ return DoNotInlineBit::decode(value) == 0;

+ }

+ void SetDoNotInlineCall() {

+ int value = Smi::cast(transition_info())->value();

+ set_transition_info(Smi::FromInt(DoNotInlineBit::update(value, true)),

+ SKIP_WRITE_BARRIER);

}

bool SitePointsToLiteral() {

@@ -8139,6 +8208,16 @@ class AllocationSite: public Struct {

return transition_info()->IsJSArray() || transition_info()->IsJSObject();

}

+ MaybeObject* DigestTransitionFeedback(ElementsKind to_kind);

+ enum Reason {

+ TENURING,

+ TRANSITIONS

+ };

+ void AddDependentCompilationInfo(Reason reason, CompilationInfo* info);

+ void AddDependentCode(Reason reason, Handle<Code> code);

DECLARE_PRINTER(AllocationSite)

DECLARE_VERIFIER(AllocationSite)

@@ -8159,6 +8238,7 @@ class AllocationSite: public Struct {

kSize> BodyDescriptor;

private:

+ inline DependentCode::DependencyGroup ToDependencyGroup(Reason reason);

DISALLOW_IMPLICIT_CONSTRUCTORS(AllocationSite);

};

@@ -8417,6 +8497,11 @@ class Symbol: public Name {

// [name]: the print name of a symbol, or undefined if none.

DECL_ACCESSORS(name, Object)

+ DECL_ACCESSORS(flags, Smi)

+ // [is_private]: whether this is a private symbol.

+ DECL_BOOLEAN_ACCESSORS(is_private)

// Casting.

static inline Symbol* cast(Object* obj);

@@ -8426,12 +8511,14 @@ class Symbol: public Name {

// Layout description.

static const int kNameOffset = Name::kSize;

- static const int kSize = kNameOffset + kPointerSize;

+ static const int kFlagsOffset = kNameOffset + kPointerSize;

+ static const int kSize = kFlagsOffset + kPointerSize;

- typedef FixedBodyDescriptor<kNameOffset, kNameOffset + kPointerSize, kSize>

- BodyDescriptor;

+ typedef FixedBodyDescriptor<kNameOffset, kFlagsOffset, kSize> BodyDescriptor;

private:

+ static const int kPrivateBit = 0;

DISALLOW_IMPLICIT_CONSTRUCTORS(Symbol);

};

@@ -9745,6 +9832,10 @@ class JSArray: public JSObject {

// is set to a smi. This matches the set function on FixedArray.

inline void set_length(Smi* length);

+ static void JSArrayUpdateLengthFromIndex(Handle<JSArray> array,

+ uint32_t index,

+ Handle<Object> value);

MUST_USE_RESULT MaybeObject* JSArrayUpdateLengthFromIndex(uint32_t index,

Object* value);

« no previous file with comments | « src/mips/stub-cache-mips.cc ('k') | src/objects.cc » ('j') | no next file with comments »