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

src/objects-inl.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 2185 matching lines @@
   int offset = kHeaderSize + index * kDoubleSize;
   return is_the_hole_nan(READ_DOUBLE_FIELD(this, offset));
 }
 
 
 SMI_ACCESSORS(
     ConstantPoolArray, first_code_ptr_index, kFirstCodePointerIndexOffset)
 SMI_ACCESSORS(
     ConstantPoolArray, first_heap_ptr_index, kFirstHeapPointerIndexOffset)
 SMI_ACCESSORS(
+    ConstantPoolArray, first_weak_ptr_index, kFirstWeakPointerIndexOffset)
+SMI_ACCESSORS(
     ConstantPoolArray, first_int32_index, kFirstInt32IndexOffset)
 
 
 int ConstantPoolArray::first_int64_index() {
   return 0;
 }
 
 
+int ConstantPoolArray::first_ptr_index() {
+  return first_code_ptr_index();
+}
+
+
 int ConstantPoolArray::count_of_int64_entries() {
   return first_code_ptr_index();
 }
 
 
 int ConstantPoolArray::count_of_code_ptr_entries() {
   return first_heap_ptr_index() - first_code_ptr_index();
 }
 
 
 int ConstantPoolArray::count_of_heap_ptr_entries() {
-  return first_int32_index() - first_heap_ptr_index();
+  return first_weak_ptr_index() - first_heap_ptr_index();
 }
 
 
+int ConstantPoolArray::count_of_weak_ptr_entries() {
+  return first_int32_index() - first_weak_ptr_index();
+}
+
+
 int ConstantPoolArray::count_of_int32_entries() {
   return length() - first_int32_index();
 }
 
 
+int ConstantPoolArray::count_of_ptr_entries() {
+  return count_of_code_ptr_entries() + count_of_heap_ptr_entries() +
+      count_of_weak_ptr_entries();
+}
+
+
 void ConstantPoolArray::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) {
   int current_index = number_of_int64_entries;
   set_first_code_ptr_index(current_index);
   current_index += number_of_code_ptr_entries;
   set_first_heap_ptr_index(current_index);
   current_index += number_of_heap_ptr_entries;
+  set_first_weak_ptr_index(current_index);
+  current_index += number_of_weak_ptr_entries;
   set_first_int32_index(current_index);
   current_index += number_of_int32_entries;
   set_length(current_index);
 }
 
 
 int64_t ConstantPoolArray::get_int64_entry(int index) {
   ASSERT(map() == GetHeap()->constant_pool_array_map());
   ASSERT(index >= 0 && index < first_code_ptr_index());
   return READ_INT64_FIELD(this, OffsetOfElementAt(index));
 }
 
 double ConstantPoolArray::get_int64_entry_as_double(int index) {
   STATIC_ASSERT(kDoubleSize == kInt64Size);
   ASSERT(map() == GetHeap()->constant_pool_array_map());
   ASSERT(index >= 0 && index < first_code_ptr_index());
   return READ_DOUBLE_FIELD(this, OffsetOfElementAt(index));
 }
 
 
 Address ConstantPoolArray::get_code_ptr_entry(int index) {
   ASSERT(map() == GetHeap()->constant_pool_array_map());
   ASSERT(index >= first_code_ptr_index() && index < first_heap_ptr_index());
   return reinterpret_cast<Address>(READ_FIELD(this, OffsetOfElementAt(index)));
 }
 
 
 Object* ConstantPoolArray::get_heap_ptr_entry(int index) {
   ASSERT(map() == GetHeap()->constant_pool_array_map());
-  ASSERT(index >= first_heap_ptr_index() && index < first_int32_index());
+  ASSERT(index >= first_heap_ptr_index() && index < first_weak_ptr_index());
   return READ_FIELD(this, OffsetOfElementAt(index));
 }
 
+
+Object* ConstantPoolArray::get_weak_ptr_entry(int index) {
+  ASSERT(map() == GetHeap()->constant_pool_array_map());
+  ASSERT(index >= first_weak_ptr_index() && index < first_int32_index());
+  return READ_FIELD(this, OffsetOfElementAt(index));
+}
+
 
 int32_t ConstantPoolArray::get_int32_entry(int index) {
   ASSERT(map() == GetHeap()->constant_pool_array_map());
   ASSERT(index >= first_int32_index() && index < length());
   return READ_INT32_FIELD(this, OffsetOfElementAt(index));
 }
 
 
 void ConstantPoolArray::set(int index, Address value) {
   ASSERT(map() == GetHeap()->constant_pool_array_map());
   ASSERT(index >= first_code_ptr_index() && index < first_heap_ptr_index());
   WRITE_FIELD(this, OffsetOfElementAt(index), reinterpret_cast<Object*>(value));
 }
 
 
 void ConstantPoolArray::set(int index, Object* value) {
   ASSERT(map() == GetHeap()->constant_pool_array_map());
-  ASSERT(index >= first_code_ptr_index() && index < first_int32_index());
+  ASSERT(index >= first_heap_ptr_index() && index < first_int32_index());
   WRITE_FIELD(this, OffsetOfElementAt(index), value);
   WRITE_BARRIER(GetHeap(), this, OffsetOfElementAt(index), value);
 }
 
 
 void ConstantPoolArray::set(int index, int64_t value) {
   ASSERT(map() == GetHeap()->constant_pool_array_map());
   ASSERT(index >= first_int64_index() && index < first_code_ptr_index());
   WRITE_INT64_FIELD(this, OffsetOfElementAt(index), value);
 }
@@ skipping 1563 matching lines @@
     return SeqTwoByteString::SizeFor(
         reinterpret_cast<SeqTwoByteString*>(this)->length());
   }
   if (instance_type == FIXED_DOUBLE_ARRAY_TYPE) {
     return FixedDoubleArray::SizeFor(
         reinterpret_cast<FixedDoubleArray*>(this)->length());
   }
   if (instance_type == CONSTANT_POOL_ARRAY_TYPE) {
     return ConstantPoolArray::SizeFor(
         reinterpret_cast<ConstantPoolArray*>(this)->count_of_int64_entries(),
-        reinterpret_cast<ConstantPoolArray*>(this)->count_of_code_ptr_entries(),
-        reinterpret_cast<ConstantPoolArray*>(this)->count_of_heap_ptr_entries(),
+        reinterpret_cast<ConstantPoolArray*>(this)->count_of_ptr_entries(),
         reinterpret_cast<ConstantPoolArray*>(this)->count_of_int32_entries());
   }
   if (instance_type >= FIRST_FIXED_TYPED_ARRAY_TYPE &&
       instance_type <= LAST_FIXED_TYPED_ARRAY_TYPE) {
     return reinterpret_cast<FixedTypedArrayBase*>(this)->size();
   }
   ASSERT(instance_type == CODE_TYPE);
   return reinterpret_cast<Code*>(this)->CodeSize();
 }
 
@@ skipping 681 matching lines @@
 }
 
 
 Object* Code::GetObjectFromEntryAddress(Address location_of_address) {
   return HeapObject::
       FromAddress(Memory::Address_at(location_of_address) - Code::kHeaderSize);
 }
 
 
 bool Code::IsWeakObjectInOptimizedCode(Object* object) {
-  ASSERT(is_optimized_code());
   if (object->IsMap()) {
     return Map::cast(object)->CanTransition() &&
            FLAG_collect_maps &&
            FLAG_weak_embedded_maps_in_optimized_code;
   }
   if (object->IsJSObject() ||
       (object->IsCell() && Cell::cast(object)->value()->IsJSObject())) {
     return FLAG_weak_embedded_objects_in_optimized_code;
   }
   return false;
@@ skipping 2169 matching lines @@
 #undef READ_UINT32_FIELD
 #undef WRITE_UINT32_FIELD
 #undef READ_SHORT_FIELD
 #undef WRITE_SHORT_FIELD
 #undef READ_BYTE_FIELD
 #undef WRITE_BYTE_FIELD
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_INL_H_