Support weak heap references in the ConstantPool to support IsWeakObjectInOptimizedCode objects.

src/objects.h

 // Copyright 2012 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 3160 matching lines @@
 
 
 // ConstantPoolArray describes a fixed-sized array containing constant pool
 // entires.
 // The format of the pool is:
 //   [0]: Field holding the first index which is a raw code target pointer entry
 //   [1]: Field holding the first index which is a heap pointer entry
 //   [2]: Field holding the first index which is a int32 entry
 //   [3]                      ... [first_code_ptr_index() - 1] : 64 bit entries
 //   [first_code_ptr_index()] ... [first_heap_ptr_index() - 1] : code pointers
-//   [first_heap_ptr_index()] ... [first_int32_index() - 1]    : heap pointers
+//   [first_heap_ptr_index()] ... [first_weak_ptr_index() - 1] : heap pointers
+//   [first_weak_ptr_index()] ... [first_int32_index() - 1]    : weak pointers
 //   [first_int32_index()]    ... [length - 1]                 : 32 bit entries
 class ConstantPoolArray: public FixedArrayBase {
  public:
   // Getters for the field storing the first index for different type entries.
+  inline int first_ptr_index();
   inline int first_code_ptr_index();
   inline int first_heap_ptr_index();
+  inline int first_weak_ptr_index();
   inline int first_int64_index();
   inline int first_int32_index();
 
   // Getters for counts of different type entries.
+  inline int count_of_ptr_entries();
   inline int count_of_code_ptr_entries();
   inline int count_of_heap_ptr_entries();
+  inline int count_of_weak_ptr_entries();
   inline int count_of_int64_entries();
   inline int count_of_int32_entries();
 
   // Setter and getter for pool elements.
   inline Address get_code_ptr_entry(int index);
   inline Object* get_heap_ptr_entry(int index);
+  inline Object* get_weak_ptr_entry(int index);
   inline int64_t get_int64_entry(int index);
   inline int32_t get_int32_entry(int index);
   inline double get_int64_entry_as_double(int index);
 
   inline void set(int index, Address value);
   inline void set(int index, Object* value);
   inline void set(int index, int64_t value);
   inline void set(int index, double value);
   inline void set(int index, int32_t value);
 
   // Set up initial state.
   inline void SetEntryCounts(int number_of_int64_entries,
                              int number_of_code_ptr_entries,
                              int number_of_heap_ptr_entries,
+                             int number_of_weak_ptr_entries,
                              int number_of_int32_entries);
 
   // Copy operations
   MUST_USE_RESULT inline MaybeObject* Copy();
 
   // Garbage collection support.
   inline static int SizeFor(int number_of_int64_entries,
-                            int number_of_code_ptr_entries,
-                            int number_of_heap_ptr_entries,
+                            int number_of_ptr_entries,
                             int number_of_int32_entries) {
     return RoundUp(OffsetAt(number_of_int64_entries,
-                            number_of_code_ptr_entries,
-                            number_of_heap_ptr_entries,
+                            number_of_ptr_entries,
                             number_of_int32_entries),
                    kPointerSize);
   }
 
   // Code Generation support.
   inline int OffsetOfElementAt(int index) {
     ASSERT(index < length());
     if (index >= first_int32_index()) {
-      return OffsetAt(count_of_int64_entries(), count_of_code_ptr_entries(),
-                      count_of_heap_ptr_entries(), index - first_int32_index());
-    } else if (index >= first_heap_ptr_index()) {
-      return OffsetAt(count_of_int64_entries(), count_of_code_ptr_entries(),
-                      index - first_heap_ptr_index(), 0);
-    } else if (index >= first_code_ptr_index()) {
-      return OffsetAt(count_of_int64_entries(), index - first_code_ptr_index(),
-                      0, 0);
+      return OffsetAt(count_of_int64_entries(), count_of_ptr_entries(),
+                      index - first_int32_index());
+    } else if (index >= first_ptr_index()) {
+      return OffsetAt(count_of_int64_entries(), index - first_ptr_index(), 0);
     } else {
-      return OffsetAt(index, 0, 0, 0);
+      return OffsetAt(index, 0, 0);
     }
   }
 
   // Casting.
   static inline ConstantPoolArray* cast(Object* obj);
 
   // Garbage collection support.
   Object** RawFieldOfElementAt(int index) {
     return HeapObject::RawField(this, OffsetOfElementAt(index));
   }
 
   // Layout description.
   static const int kFirstCodePointerIndexOffset = FixedArray::kHeaderSize;
   static const int kFirstHeapPointerIndexOffset =
       kFirstCodePointerIndexOffset + kPointerSize;
+  static const int kFirstWeakPointerIndexOffset =
+      kFirstHeapPointerIndexOffset + kPointerSize;
   static const int kFirstInt32IndexOffset =
-      kFirstHeapPointerIndexOffset + kPointerSize;
+      kFirstWeakPointerIndexOffset + kPointerSize;
   static const int kFirstOffset = kFirstInt32IndexOffset + kPointerSize;
 
   // Dispatched behavior.
   void ConstantPoolIterateBody(ObjectVisitor* v);
 
   DECLARE_PRINTER(ConstantPoolArray)
   DECLARE_VERIFIER(ConstantPoolArray)
 
  private:
   inline void set_first_code_ptr_index(int value);
   inline void set_first_heap_ptr_index(int value);
+  inline void set_first_weak_ptr_index(int value);
   inline void set_first_int32_index(int value);
 
   inline static int OffsetAt(int number_of_int64_entries,
-                             int number_of_code_ptr_entries,
-                             int number_of_heap_ptr_entries,
+                             int number_of_ptr_entries,
                              int number_of_int32_entries) {
     return kFirstOffset
         + (number_of_int64_entries * kInt64Size)
-        + (number_of_code_ptr_entries * kPointerSize)
-        + (number_of_heap_ptr_entries * kPointerSize)
+        + (number_of_ptr_entries * kPointerSize)
         + (number_of_int32_entries * kInt32Size);
   }
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(ConstantPoolArray);
 };
 
 
 // DescriptorArrays are fixed arrays used to hold instance descriptors.
 // The format of the these objects is:
 //   [0]: Number of descriptors
@@ skipping 2249 matching lines @@
   bool CanDeoptAt(Address pc);
 
 #ifdef VERIFY_HEAP
   void VerifyEmbeddedObjectsDependency();
 #endif
 
   inline bool IsWeakObject(Object* object) {
     return is_optimized_code() && IsWeakObjectInOptimizedCode(object);
   }
 
-  inline bool IsWeakObjectInOptimizedCode(Object* object);
+  static inline bool IsWeakObjectInOptimizedCode(Object* object);
 
   // Max loop nesting marker used to postpose OSR. We don't take loop
   // nesting that is deeper than 5 levels into account.
   static const int kMaxLoopNestingMarker = 6;
 
   // Layout description.
   static const int kInstructionSizeOffset = HeapObject::kHeaderSize;
   static const int kRelocationInfoOffset = kInstructionSizeOffset + kIntSize;
   static const int kHandlerTableOffset = kRelocationInfoOffset + kPointerSize;
   static const int kDeoptimizationDataOffset =
@@ skipping 5221 matching lines @@
     } else {
       value &= ~(1 << bit_position);
     }
     return value;
   }
 };
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_H_