Allow in-object properties in JSFunctions.

src/objects-body-descriptors-inl.h

 // Copyright 2015 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef V8_OBJECTS_BODY_DESCRIPTORS_INL_H_
 #define V8_OBJECTS_BODY_DESCRIPTORS_INL_H_
 
 #include "src/objects-body-descriptors.h"
 
 namespace v8 {
@@ skipping 98 matching lines @@
 // Iterates the function object according to the visiting policy.
 template <JSFunction::BodyVisitingPolicy body_visiting_policy>
 class JSFunction::BodyDescriptorImpl final : public BodyDescriptorBase {
  public:
   STATIC_ASSERT(kNonWeakFieldsEndOffset == kCodeEntryOffset);
   STATIC_ASSERT(kCodeEntryOffset + kPointerSize == kNextFunctionLinkOffset);
   STATIC_ASSERT(kNextFunctionLinkOffset + kPointerSize == kSize);
 
   static bool IsValidSlot(HeapObject* obj, int offset) {
     if (offset < kSize) return true;
-    // TODO(ishell): v8:4531, fix when JFunctions are allowed to have
-    // in-object properties
-    // return IsValidSlotImpl(obj, offset);
-    return true;
+    return IsValidSlotImpl(obj, offset);
   }
 
   template <typename ObjectVisitor>
   static inline void IterateBody(HeapObject* obj, int object_size,
                                  ObjectVisitor* v) {
     IteratePointers(obj, kPropertiesOffset, kNonWeakFieldsEndOffset, v);
 
     if (body_visiting_policy & kVisitCodeEntry) {
       v->VisitCodeEntry(obj->address() + kCodeEntryOffset);
     }
 
     if (body_visiting_policy & kVisitNextFunction) {
       IteratePointers(obj, kNextFunctionLinkOffset, kSize, v);
     }
-
-    // TODO(ishell): v8:4531, fix when JFunctions are allowed to have in-object
-    // properties
-    // IterateBodyImpl(obj, kSize, object_size, v);
+    IterateBodyImpl(obj, kSize, object_size, v);
   }
 
   template <typename StaticVisitor>
   static inline void IterateBody(HeapObject* obj, int object_size) {
     Heap* heap = obj->GetHeap();
     IteratePointers<StaticVisitor>(heap, obj, kPropertiesOffset,
                                    kNonWeakFieldsEndOffset);
 
     if (body_visiting_policy & kVisitCodeEntry) {
       StaticVisitor::VisitCodeEntry(heap, obj,
                                     obj->address() + kCodeEntryOffset);
     }
 
     if (body_visiting_policy & kVisitNextFunction) {
       IteratePointers<StaticVisitor>(heap, obj, kNextFunctionLinkOffset, kSize);
     }
-
-    // TODO(ishell): v8:4531, fix when JFunctions are allowed to have in-object
-    // properties
-    // IterateBodyImpl<StaticVisitor>(heap, obj, kSize, object_size);
+    IterateBodyImpl<StaticVisitor>(heap, obj, kSize, object_size);
   }
 
   static inline int SizeOf(Map* map, HeapObject* object) {
-    // TODO(ishell): v8:4531, fix when JFunctions are allowed to have in-object
-    // properties
-    return JSFunction::kSize;
+    return map->instance_size();
   }
 };
 
 
 class JSArrayBuffer::BodyDescriptor final : public BodyDescriptorBase {
  public:
   STATIC_ASSERT(kByteLengthOffset + kPointerSize == kBackingStoreOffset);
   STATIC_ASSERT(kBackingStoreOffset + kPointerSize == kBitFieldSlot);
   STATIC_ASSERT(kBitFieldSlot + kPointerSize == kSize);
 
@@ skipping 371 matching lines @@
       PrintF("Unknown type: %d\n", type);
       UNREACHABLE();
       return ReturnType();
   }
 }
 
 
 template <typename ObjectVisitor>
 void HeapObject::IterateFast(ObjectVisitor* v) {
   BodyDescriptorBase::IteratePointer(this, kMapOffset, v);
-  IterateBody(v);
+  IterateBodyFast(v);
 }
 
 
 template <typename ObjectVisitor>
 void HeapObject::IterateBodyFast(ObjectVisitor* v) {
   Map* m = map();
-  IterateBody(m->instance_type(), SizeFromMap(m), v);
+  IterateBodyFast(m->instance_type(), SizeFromMap(m), v);
 }
 
 
 struct CallIterateBody {
   template <typename BodyDescriptor, typename ObjectVisitor>
   static void apply(HeapObject* obj, int object_size, ObjectVisitor* v) {
     BodyDescriptor::IterateBody(obj, object_size, v);
   }
 };
 
 template <typename ObjectVisitor>
 void HeapObject::IterateBodyFast(InstanceType type, int object_size,
                                  ObjectVisitor* v) {
   BodyDescriptorApply<CallIterateBody, void>(type, this, object_size, v);
 }
 }  // namespace internal
 }  // namespace v8
 
 #endif  // V8_OBJECTS_BODY_DESCRIPTORS_INL_H_