Reviewers: Yury Semikhatsky, loislo, Sven Panne,
Message:
Folks, could you please take a look. Thanks!
Description:
Handle AccessorPair struct in heap snapshot.
Please review this at https://codereview.chromium.org/17616002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files:
M src/heap-snapshot-generator.h
M src/heap-snapshot-generator.cc
Index: src/heap-snapshot-generator.cc
diff --git a/src/heap-snapshot-generator.cc b/src/heap-snapshot-generator.cc
index
217d1ca25ecfa9dae22b7270b973700c67a2a09f..3553f79b9f7a1a98c633f1a559ee129a9f0f2d1c
100644
--- a/src/heap-snapshot-generator.cc
+++ b/src/heap-snapshot-generator.cc
@@ -974,6 +974,8 @@ void V8HeapExplorer::ExtractReferences(HeapObject* obj)
{
ExtractSharedFunctionInfoReferences(entry,
SharedFunctionInfo::cast(obj));
} else if (obj->IsScript()) {
ExtractScriptReferences(entry, Script::cast(obj));
+ } else if (obj->IsAccessorPair()) {
+ ExtractAccessorPairReferences(entry, AccessorPair::cast(obj));
} else if (obj->IsCodeCache()) {
ExtractCodeCacheReferences(entry, CodeCache::cast(obj));
} else if (obj->IsCode()) {
@@ -1242,6 +1244,19 @@ void V8HeapExplorer::ExtractScriptReferences(int
entry, Script* script) {
}
+void V8HeapExplorer::ExtractAccessorPairReferences(
+ int entry, AccessorPair* accessors) {
+ if (Object* getter = accessors->getter()) {
+ SetInternalReference(accessors, entry,
+ "getter", getter, AccessorPair::kGetterOffset);
+ }
+ if (Object* setter = accessors->setter()) {
+ SetInternalReference(accessors, entry,
+ "setter", setter, AccessorPair::kSetterOffset);
+ }
+}
+
+
void V8HeapExplorer::ExtractCodeCacheReferences(
int entry, CodeCache* code_cache) {
TagObject(code_cache->default_cache(), "(default code cache)");
@@ -1353,21 +1368,11 @@ void
V8HeapExplorer::ExtractPropertyReferences(JSObject* js_obj, int entry) {
js_obj, entry,
descs->GetKey(i), descs->GetConstantFunction(i));
break;
- case CALLBACKS: {
- Object* callback_obj = descs->GetValue(i);
- if (callback_obj->IsAccessorPair()) {
- AccessorPair* accessors = AccessorPair::cast(callback_obj);
- if (Object* getter = accessors->getter()) {
- SetPropertyReference(js_obj, entry, descs->GetKey(i),
- getter, "get-%s");
- }
- if (Object* setter = accessors->setter()) {
- SetPropertyReference(js_obj, entry, descs->GetKey(i),
- setter, "set-%s");
- }
- }
+ case CALLBACKS:
+ ExtractAccessorPairProperty(
+ js_obj, entry,
+ descs->GetKey(i), descs->GetValue(i));
break;
- }
case NORMAL: // only in slow mode
case HANDLER: // only in lookup results, not in descriptors
case INTERCEPTOR: // only in lookup results, not in descriptors
@@ -1389,18 +1394,34 @@ void
V8HeapExplorer::ExtractPropertyReferences(JSObject* js_obj, int entry) {
Object* value = target->IsPropertyCell()
? PropertyCell::cast(target)->value()
: target;
- if (k != heap_->hidden_string()) {
- SetPropertyReference(js_obj, entry, String::cast(k), value);
- } else {
+ if (k == heap_->hidden_string()) {
TagObject(value, "(hidden properties)");
SetInternalReference(js_obj, entry, "hidden_properties", value);
+ continue;
}
+ ExtractAccessorPairProperty(js_obj, entry, k, value);
+ SetPropertyReference(js_obj, entry, String::cast(k), value);
}
}
}
}
+void V8HeapExplorer::ExtractAccessorPairProperty(
+ JSObject* js_obj, int entry, Object* key, Object* callback_obj) {
+ if (!callback_obj->IsAccessorPair()) return;
+ AccessorPair* accessors = AccessorPair::cast(callback_obj);
+ Object* getter = accessors->getter();
+ if (getter && !getter->IsOddball()) {
+ SetPropertyReference(js_obj, entry, String::cast(key),
getter, "get-%s");
+ }
+ Object* setter = accessors->setter();
+ if (setter && !setter->IsOddball()) {
+ SetPropertyReference(js_obj, entry, String::cast(key),
setter, "set-%s");
+ }
+}
+
+
void V8HeapExplorer::ExtractElementReferences(JSObject* js_obj, int entry)
{
if (js_obj->HasFastObjectElements()) {
FixedArray* elements = FixedArray::cast(js_obj->elements());
Index: src/heap-snapshot-generator.h
diff --git a/src/heap-snapshot-generator.h b/src/heap-snapshot-generator.h
index
c9a82f0ff03545d761e4d65bcc1e0cff9f5d0977..a54002b0d1281b1ddd99397b0a1f13e831f68fe7
100644
--- a/src/heap-snapshot-generator.h
+++ b/src/heap-snapshot-generator.h
@@ -462,12 +462,15 @@ class V8HeapExplorer : public HeapEntriesAllocator {
void ExtractSharedFunctionInfoReferences(int entry,
SharedFunctionInfo* shared);
void ExtractScriptReferences(int entry, Script* script);
+ void ExtractAccessorPairReferences(int entry, AccessorPair* accessors);
void ExtractCodeCacheReferences(int entry, CodeCache* code_cache);
void ExtractCodeReferences(int entry, Code* code);
void ExtractCellReferences(int entry, Cell* cell);
void ExtractPropertyCellReferences(int entry, PropertyCell* cell);
void ExtractClosureReferences(JSObject* js_obj, int entry);
void ExtractPropertyReferences(JSObject* js_obj, int entry);
+ void ExtractAccessorPairProperty(JSObject* js_obj, int entry,
+ Object* key, Object* callback_obj);
void ExtractElementReferences(JSObject* js_obj, int entry);
void ExtractInternalReferences(JSObject* js_obj, int entry);
bool IsEssentialObject(Object* object);
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
