| Index: src/profile-generator.cc
|
| diff --git a/src/profile-generator.cc b/src/profile-generator.cc
|
| index b853f33cb19aa2a15405cbdca4f76fdf3d25382b..c57ec3506665c6d8d0766379309c659f133f5dab 100644
|
| --- a/src/profile-generator.cc
|
| +++ b/src/profile-generator.cc
|
| @@ -1774,7 +1774,14 @@ void V8HeapExplorer::AddRootEntries(SnapshotFillerInterface* filler) {
|
|
|
| const char* V8HeapExplorer::GetSystemEntryName(HeapObject* object) {
|
| switch (object->map()->instance_type()) {
|
| - case MAP_TYPE: return "system / Map";
|
| + case MAP_TYPE:
|
| + switch (Map::cast(object)->instance_type()) {
|
| +#define MAKE_STRING_MAP_CASE(instance_type, size, name, Name) \
|
| + case instance_type: return "system / Map (" #Name ")";
|
| + STRING_TYPE_LIST(MAKE_STRING_MAP_CASE)
|
| +#undef MAKE_STRING_MAP_CASE
|
| + default: return "system / Map";
|
| + }
|
| case JS_GLOBAL_PROPERTY_CELL_TYPE: return "system / JSGlobalPropertyCell";
|
| case FOREIGN_TYPE: return "system / Foreign";
|
| case ODDBALL_TYPE: return "system / Oddball";
|
| @@ -1851,7 +1858,6 @@ void V8HeapExplorer::ExtractReferences(HeapObject* obj) {
|
| ExtractJSObjectReferences(entry, JSObject::cast(obj));
|
| } else if (obj->IsString()) {
|
| ExtractStringReferences(entry, String::cast(obj));
|
| - extract_indexed_refs = false;
|
| } else if (obj->IsContext()) {
|
| ExtractContextReferences(entry, Context::cast(obj));
|
| } else if (obj->IsMap()) {
|
| @@ -1966,11 +1972,14 @@ void V8HeapExplorer::ExtractJSObjectReferences(
|
| void V8HeapExplorer::ExtractStringReferences(int entry, String* string) {
|
| if (string->IsConsString()) {
|
| ConsString* cs = ConsString::cast(string);
|
| - SetInternalReference(cs, entry, "first", cs->first());
|
| - SetInternalReference(cs, entry, "second", cs->second());
|
| + SetInternalReference(cs, entry, "first", cs->first(),
|
| + ConsString::kFirstOffset);
|
| + SetInternalReference(cs, entry, "second", cs->second(),
|
| + ConsString::kSecondOffset);
|
| } else if (string->IsSlicedString()) {
|
| SlicedString* ss = SlicedString::cast(string);
|
| - SetInternalReference(ss, entry, "parent", ss->parent());
|
| + SetInternalReference(ss, entry, "parent", ss->parent(),
|
| + SlicedString::kParentOffset);
|
| }
|
| }
|
|
|
|
|