| Index: src/objects.h
|
| diff --git a/src/objects.h b/src/objects.h
|
| index 6c615ac75610301c8a3f162ee9ccf50bf72b277a..e39eb68b001438ab2de6a3cf2c544ba2cd6688bc 100644
|
| --- a/src/objects.h
|
| +++ b/src/objects.h
|
| @@ -69,7 +69,6 @@
|
| // - JSDate
|
| // - JSMessageObject
|
| // - JSProxy
|
| -// - JSFunctionProxy
|
| // - FixedArrayBase
|
| // - ByteArray
|
| // - BytecodeArray
|
| @@ -439,7 +438,6 @@ const int kStubMinorKeyBits = kSmiValueSize - kStubMajorKeyBits - 1;
|
| V(JS_REGEXP_TYPE) \
|
| \
|
| V(JS_FUNCTION_TYPE) \
|
| - V(JS_FUNCTION_PROXY_TYPE) \
|
| V(DEBUG_INFO_TYPE) \
|
| V(BREAK_POINT_INFO_TYPE)
|
|
|
| @@ -711,9 +709,8 @@ 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_FUNCTION_PROXY_TYPE, // FIRST_JS_RECEIVER_TYPE, FIRST_JS_PROXY_TYPE
|
| - JS_PROXY_TYPE, // LAST_JS_PROXY_TYPE
|
| - JS_VALUE_TYPE, // FIRST_JS_OBJECT_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,
|
| @@ -757,16 +754,13 @@ enum InstanceType {
|
| // are not continuous in this enum! The enum ranges instead reflect the
|
| // external class names, where proxies are treated as either ordinary objects,
|
| // or functions.
|
| - FIRST_JS_RECEIVER_TYPE = JS_FUNCTION_PROXY_TYPE,
|
| + 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_VALUE_TYPE,
|
| LAST_JS_OBJECT_TYPE = LAST_TYPE,
|
| - // Boundaries for testing the types represented as JSProxy
|
| - FIRST_JS_PROXY_TYPE = JS_FUNCTION_PROXY_TYPE,
|
| - LAST_JS_PROXY_TYPE = JS_PROXY_TYPE,
|
| //
|
| - FIRST_NONCALLABLE_SPEC_OBJECT_TYPE = JS_PROXY_TYPE,
|
| + FIRST_NONCALLABLE_SPEC_OBJECT_TYPE = JS_VALUE_TYPE,
|
| LAST_NONCALLABLE_SPEC_OBJECT_TYPE = JS_REGEXP_TYPE,
|
| // Note that the types for which typeof is "function" are not continuous.
|
| // Define this so that we can put assertions on discrete checks.
|
| @@ -975,7 +969,6 @@ template <class C> inline bool Is(Object* obj);
|
| V(JSTypedArray) \
|
| V(JSDataView) \
|
| V(JSProxy) \
|
| - V(JSFunctionProxy) \
|
| V(JSSet) \
|
| V(JSMap) \
|
| V(JSSetIterator) \
|
| @@ -9597,32 +9590,6 @@ class JSProxy: public JSReceiver {
|
| };
|
|
|
|
|
| -class JSFunctionProxy: public JSProxy {
|
| - public:
|
| - // [call_trap]: The call trap.
|
| - DECL_ACCESSORS(call_trap, JSReceiver)
|
| -
|
| - // [construct_trap]: The construct trap.
|
| - DECL_ACCESSORS(construct_trap, Object)
|
| -
|
| - DECLARE_CAST(JSFunctionProxy)
|
| -
|
| - // Dispatched behavior.
|
| - DECLARE_PRINTER(JSFunctionProxy)
|
| - DECLARE_VERIFIER(JSFunctionProxy)
|
| -
|
| - // Layout description.
|
| - static const int kCallTrapOffset = JSProxy::kSize;
|
| - static const int kConstructTrapOffset = kCallTrapOffset + kPointerSize;
|
| - static const int kSize = kConstructTrapOffset + kPointerSize;
|
| -
|
| - typedef FixedBodyDescriptor<kTargetOffset, kSize, kSize> BodyDescriptor;
|
| -
|
| - private:
|
| - DISALLOW_IMPLICIT_CONSTRUCTORS(JSFunctionProxy);
|
| -};
|
| -
|
| -
|
| class JSCollection : public JSObject {
|
| public:
|
| // [table]: the backing hash table
|
|
|