| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index bf0eaeda9e1914efb7ac255245cea0b698fd6cdd..91efb65ac1e8eb062b7ccc53903ea5592da837a4 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -419,7 +419,6 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1;
|
| V(JS_MODULE_TYPE) \
|
| V(JS_GLOBAL_OBJECT_TYPE) \
|
| V(JS_GLOBAL_PROXY_TYPE) \
|
| - V(JS_SPECIAL_API_OBJECT_TYPE) \
|
| V(JS_ARRAY_TYPE) \
|
| V(JS_ARRAY_BUFFER_TYPE) \
|
| V(JS_TYPED_ARRAY_TYPE) \
|
| @@ -439,6 +438,7 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1;
|
| V(DEBUG_INFO_TYPE) \
|
| V(BREAK_POINT_INFO_TYPE)
|
|
|
| +
|
| // Since string types are not consecutive, this macro is used to
|
| // iterate over them.
|
| #define STRING_TYPE_LIST(V) \
|
| @@ -591,6 +591,7 @@ static inline bool IsShortcutCandidate(int type) {
|
| return ((type & kShortcutTypeMask) == kShortcutTypeTag);
|
| }
|
|
|
| +
|
| enum InstanceType {
|
| // String types.
|
| INTERNALIZED_STRING_TYPE = kTwoByteStringTag | kSeqStringTag |
|
| @@ -702,18 +703,16 @@ enum InstanceType {
|
| // objects in the JS sense. The first and the last type in this range are
|
| // the two forms of function. This organization enables using the same
|
| // compares for checking the JS_RECEIVER and the NONCALLABLE_JS_OBJECT range.
|
| - JS_PROXY_TYPE, // FIRST_JS_RECEIVER_TYPE
|
| - JS_GLOBAL_OBJECT_TYPE, // FIRST_JS_OBJECT_TYPE
|
| - JS_GLOBAL_PROXY_TYPE,
|
| - // Like JS_OBJECT_TYPE, but requires access checks and/or has interceptors.
|
| - JS_SPECIAL_API_OBJECT_TYPE, // LAST_SPECIAL_RECEIVER_TYPE
|
| - JS_VALUE_TYPE,
|
| + JS_PROXY_TYPE, // FIRST_JS_RECEIVER_TYPE
|
| + JS_VALUE_TYPE, // FIRST_JS_OBJECT_TYPE
|
| JS_MESSAGE_OBJECT_TYPE,
|
| JS_DATE_TYPE,
|
| JS_OBJECT_TYPE,
|
| JS_CONTEXT_EXTENSION_OBJECT_TYPE,
|
| JS_GENERATOR_OBJECT_TYPE,
|
| JS_MODULE_TYPE,
|
| + JS_GLOBAL_OBJECT_TYPE,
|
| + JS_GLOBAL_PROXY_TYPE,
|
| JS_ARRAY_TYPE,
|
| JS_ARRAY_BUFFER_TYPE,
|
| JS_TYPED_ARRAY_TYPE,
|
| @@ -754,10 +753,8 @@ enum InstanceType {
|
| FIRST_JS_RECEIVER_TYPE = JS_PROXY_TYPE,
|
| LAST_JS_RECEIVER_TYPE = LAST_TYPE,
|
| // Boundaries for testing the types represented as JSObject
|
| - FIRST_JS_OBJECT_TYPE = JS_GLOBAL_OBJECT_TYPE,
|
| + FIRST_JS_OBJECT_TYPE = JS_VALUE_TYPE,
|
| LAST_JS_OBJECT_TYPE = LAST_TYPE,
|
| - // Boundary for testing JSReceivers that need special property lookup handling
|
| - LAST_SPECIAL_RECEIVER_TYPE = JS_SPECIAL_API_OBJECT_TYPE,
|
| };
|
|
|
| STATIC_ASSERT(JS_OBJECT_TYPE == Internals::kJSObjectType);
|
|
|