AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Inline AllocationMemento::FindForHeapObject() into the two call sites.

Browse Source 
R=mvstanton@chromium.org

Review URL: https://codereview.chromium.org/136633002

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@18565 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
bmeurer@chromium.org 2014-01-13 13:11:46 +00:00
parent da52e9106e
commit 53e29e5f19
3 changed files with 40 additions and 60 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/heap-inl.h
View File

@ -485,22 +485,32 @@ void Heap::ScavengePointer(HeapObject** p) {
void Heap::UpdateAllocationSiteFeedback(HeapObject* object) {
Heap* heap = object->GetHeap();
if (FLAG_allocation_site_pretenuring &&
heap->new_space_high_promotion_mode_active_ &&
AllocationSite::CanTrack(object->map()->instance_type())) {
AllocationMemento* memento = AllocationMemento::FindForHeapObject(
object, heap, true);
if (memento != NULL) {
ASSERT(memento->IsValid());
bool add_to_scratchpad =
memento->GetAllocationSite()->IncrementMementoFoundCount();
if (add_to_scratchpad && heap->allocation_sites_scratchpad_length <
kAllocationSiteScratchpadSize) {
heap->allocation_sites_scratchpad[
heap->allocation_sites_scratchpad_length++] =
memento->GetAllocationSite();
}
}
ASSERT(heap->InNewSpace(object));
if (!FLAG_allocation_site_pretenuring ||
!heap->new_space_high_promotion_mode_active_ ||
!AllocationSite::CanTrack(object->map()->instance_type())) return;
// Either object is the last object in the from space, or there is another
// object of at least word size (the header map word) following it, so
// suffices to compare ptr and top here.
Address ptr = object->address() + object->Size();
Address top = heap->new_space()->FromSpacePageHigh();
ASSERT(ptr == top || ptr + HeapObject::kHeaderSize <= top);
if (ptr == top) return;
HeapObject* candidate = HeapObject::FromAddress(ptr);
if (candidate->map() != heap->allocation_memento_map()) return;
AllocationMemento* memento = AllocationMemento::cast(candidate);
if (!memento->IsValid()) return;
if (memento->GetAllocationSite()->IncrementMementoFoundCount() &&
heap->allocation_sites_scratchpad_length <
kAllocationSiteScratchpadSize) {
heap->allocation_sites_scratchpad[
heap->allocation_sites_scratchpad_length++] =
memento->GetAllocationSite();
}
}

54
src/objects.cc
View File

@ -9201,39 +9201,6 @@ Handle<String> SeqString::Truncate(Handle<SeqString> string, int new_length) {
}
AllocationMemento* AllocationMemento::FindForHeapObject(HeapObject* object,
Heap* heap,
bool in_GC) {
// AllocationMemento objects are only allocated immediately after objects in
// NewSpace. Detecting whether a memento is present involves carefully
// checking the object immediately after the current object (if there is one)
// to see if it's an AllocationMemento.
ASSERT(heap->InNewSpace(object));
Address ptr_end = (reinterpret_cast<Address>(object) - kHeapObjectTag) +
object->Size();
Address top;
if (in_GC) {
top = heap->new_space()->FromSpacePageHigh();
} else {
top = heap->NewSpaceTop();
}
if ((ptr_end + AllocationMemento::kSize) <= top) {
// There is room in newspace for allocation info. Do we have some?
Map** possible_allocation_memento_map =
reinterpret_cast<Map**>(ptr_end);
if (*possible_allocation_memento_map ==
object->GetHeap()->allocation_memento_map()) {
AllocationMemento* memento = AllocationMemento::cast(
reinterpret_cast<Object*>(ptr_end + kHeapObjectTag));
if (memento->IsValid()) {
return memento;
}
}
}
return NULL;
}
uint32_t StringHasher::MakeArrayIndexHash(uint32_t value, int length) {
// For array indexes mix the length into the hash as an array index could
// be zero.
@ -12904,17 +12871,24 @@ void JSObject::UpdateAllocationSite(Handle<JSObject> object,
MaybeObject* JSObject::UpdateAllocationSite(ElementsKind to_kind) {
if (!IsJSArray()) {
return this;
}
if (!IsJSArray()) return this;
Heap* heap = GetHeap();
if (!heap->InNewSpace(this)) return this;
AllocationMemento* memento = AllocationMemento::FindForHeapObject(this, heap);
if (memento == NULL || !memento->IsValid()) {
return this;
}
// Either object is the last object in the new space, or there is another
// object of at least word size (the header map word) following it, so
// suffices to compare ptr and top here.
Address ptr = address() + JSArray::kSize;
Address top = heap->NewSpaceTop();
ASSERT(ptr == top || ptr + HeapObject::kHeaderSize <= top);
if (ptr == top) return this;
HeapObject* candidate = HeapObject::FromAddress(ptr);
if (candidate->map() != heap->allocation_memento_map()) return this;
AllocationMemento* memento = AllocationMemento::cast(candidate);
if (!memento->IsValid()) return this;
// Walk through to the Allocation Site
AllocationSite* site = memento->GetAllocationSite();

4
src/objects.h
View File

@ -8305,10 +8305,6 @@ class AllocationMemento: public Struct {
DECLARE_PRINTER(AllocationMemento)
DECLARE_VERIFIER(AllocationMemento)
// Returns NULL if no AllocationMemento is available for object.
static AllocationMemento* FindForHeapObject(HeapObject* object,
Heap* heap,
bool in_GC = false);
static inline AllocationMemento* cast(Object* obj);
private: