Differentate between code target pointers and heap pointers in constant pools.

src/objects-visiting-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 471 matching lines @@
   }
   VisitSharedFunctionInfoStrongCode(heap, object);
 }
 
 
 template<typename StaticVisitor>
 void StaticMarkingVisitor<StaticVisitor>::VisitConstantPoolArray(
     Map* map, HeapObject* object) {
   Heap* heap = map->GetHeap();
   ConstantPoolArray* constant_pool = ConstantPoolArray::cast(object);
-  if (constant_pool->count_of_ptr_entries() > 0) {
-    int first_ptr_offset = constant_pool->OffsetOfElementAt(
-        constant_pool->first_ptr_index());
-    int last_ptr_offset = constant_pool->OffsetOfElementAt(
-        constant_pool->first_ptr_index() +
-        constant_pool->count_of_ptr_entries() - 1);
-    StaticVisitor::VisitPointers(
-        heap,
-        HeapObject::RawField(object, first_ptr_offset),
-        HeapObject::RawField(object, last_ptr_offset));
+  for (int i = 0; i < constant_pool->count_of_code_ptr_entries(); i++) {
+    int offset =  constant_pool->OffsetOfElementAt(

[Michael Starzinger, 2014/03/07 15:07:47]

nit: Two white-spaces after equal sign.

[rmcilroy, 2014/03/10 14:03:05]

Done.

+        constant_pool->first_code_ptr_index() + i);
+    StaticVisitor::VisitCodeEntry(heap,
+        reinterpret_cast<Address>(HeapObject::RawField(constant_pool, offset)));
+  }
+  for (int i = 0; i < constant_pool->count_of_heap_ptr_entries(); i++) {
+    int offset =  constant_pool->OffsetOfElementAt(

[Michael Starzinger, 2014/03/07 15:07:47]

nit: Two white-spaces after equal sign.

[rmcilroy, 2014/03/10 14:03:05]

Done.

+        constant_pool->first_heap_ptr_index() + i);
+    StaticVisitor::VisitPointer(heap,
+                                HeapObject::RawField(constant_pool, offset));
   }
 }
 
 
 template<typename StaticVisitor>
 void StaticMarkingVisitor<StaticVisitor>::VisitJSFunction(
     Map* map, HeapObject* object) {
   Heap* heap = map->GetHeap();
   JSFunction* function = JSFunction::cast(object);
   MarkCompactCollector* collector = heap->mark_compact_collector();
@@ skipping 428 matching lines @@
   RelocIterator it(this, mode_mask);
   for (; !it.done(); it.next()) {
     it.rinfo()->template Visit<StaticVisitor>(heap);
   }
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_OBJECTS_VISITING_INL_H_