test/cctest/test-heap-profiler.cc - Issue 10086006: External references should not affect dominance relation.

Unified Diff: test/cctest/test-heap-profiler.cc

Issue 10086006: External references should not affect dominance relation. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge

Patch Set: Addressing comments. Created 8 years, 8 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

Index: test/cctest/test-heap-profiler.cc

diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc

index 1404fecd97cab20ef3371c4a3985885560fc1a90..05839ee94c7a389868bdbcf76d4cf12bf9f7d885 100644

--- a/test/cctest/test-heap-profiler.cc

+++ b/test/cctest/test-heap-profiler.cc

@@ -109,13 +109,13 @@ TEST(HeapSnapshot) {

// Verify, that JS global object of env2 has '..2' properties.

const v8::HeapGraphNode* a2_node =

- GetProperty(global_env2, v8::HeapGraphEdge::kShortcut, "a2");

+ GetProperty(global_env2, v8::HeapGraphEdge::kProperty, "a2");

CHECK_NE(NULL, a2_node);

CHECK_NE(

- NULL, GetProperty(global_env2, v8::HeapGraphEdge::kShortcut, "b2_1"));

+ NULL, GetProperty(global_env2, v8::HeapGraphEdge::kProperty, "b2_1"));

CHECK_NE(

- NULL, GetProperty(global_env2, v8::HeapGraphEdge::kShortcut, "b2_2"));

- CHECK_NE(NULL, GetProperty(global_env2, v8::HeapGraphEdge::kShortcut, "c2"));

+ NULL, GetProperty(global_env2, v8::HeapGraphEdge::kProperty, "b2_2"));

+ CHECK_NE(NULL, GetProperty(global_env2, v8::HeapGraphEdge::kProperty, "c2"));

// Paint all nodes reachable from global object.

NamedEntriesDetector det;

@@ -137,12 +137,13 @@ TEST(HeapSnapshotObjectSizes) {

CompileRun(

"function X(a, b) { this.a = a; this.b = b; }\n"

"x = new X(new X(), new X());\n"

+ "dummy = new X();\n"

"(function() { x.a.a = x.b; })();");

const v8::HeapSnapshot* snapshot =

v8::HeapProfiler::TakeSnapshot(v8_str("sizes"));

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

const v8::HeapGraphNode* x =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "x");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "x");

CHECK_NE(NULL, x);

const v8::HeapGraphNode* x1 =

GetProperty(x, v8::HeapGraphEdge::kProperty, "a");

@@ -169,7 +170,7 @@ TEST(BoundFunctionInSnapshot) {

v8::HeapProfiler::TakeSnapshot(v8_str("sizes"));

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

const v8::HeapGraphNode* f =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "boundFunction");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "boundFunction");

CHECK(f);

CHECK_EQ(v8::String::New("native_bind"), f->GetName());

const v8::HeapGraphNode* bindings =

@@ -233,15 +234,15 @@ TEST(HeapSnapshotCodeObjects) {

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

const v8::HeapGraphNode* compiled =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "compiled");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "compiled");

CHECK_NE(NULL, compiled);

CHECK_EQ(v8::HeapGraphNode::kClosure, compiled->GetType());

const v8::HeapGraphNode* lazy =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "lazy");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "lazy");

CHECK_NE(NULL, lazy);

CHECK_EQ(v8::HeapGraphNode::kClosure, lazy->GetType());

const v8::HeapGraphNode* anonymous =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "anonymous");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "anonymous");

CHECK_NE(NULL, anonymous);

CHECK_EQ(v8::HeapGraphNode::kClosure, anonymous->GetType());

v8::String::AsciiValue anonymous_name(anonymous->GetName());

@@ -293,9 +294,9 @@ TEST(HeapSnapshotHeapNumbers) {

const v8::HeapSnapshot* snapshot =

v8::HeapProfiler::TakeSnapshot(v8_str("numbers"));

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

- CHECK_EQ(NULL, GetProperty(global, v8::HeapGraphEdge::kShortcut, "a"));

+ CHECK_EQ(NULL, GetProperty(global, v8::HeapGraphEdge::kProperty, "a"));

const v8::HeapGraphNode* b =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "b");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "b");

CHECK_NE(NULL, b);

CHECK_EQ(v8::HeapGraphNode::kHeapNumber, b->GetType());

}

@@ -313,10 +314,10 @@ TEST(HeapSnapshotSlicedString) {

v8::HeapProfiler::TakeSnapshot(v8_str("strings"));

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

const v8::HeapGraphNode* parent_string =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "parent_string");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "parent_string");

CHECK_NE(NULL, parent_string);

const v8::HeapGraphNode* child_string =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "child_string");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "child_string");

CHECK_NE(NULL, child_string);

const v8::HeapGraphNode* parent =

GetProperty(child_string, v8::HeapGraphEdge::kInternal, "parent");

@@ -384,24 +385,17 @@ TEST(HeapEntryIdsAndArrayShift) {

const v8::HeapGraphNode* a1 =

GetProperty(global1, v8::HeapGraphEdge::kProperty, "a");

CHECK_NE(NULL, a1);

- const v8::HeapGraphNode* e1 =

- GetProperty(a1, v8::HeapGraphEdge::kHidden, "1");

- CHECK_NE(NULL, e1);

const v8::HeapGraphNode* k1 =

- GetProperty(e1, v8::HeapGraphEdge::kInternal, "elements");

+ GetProperty(a1, v8::HeapGraphEdge::kInternal, "elements");

CHECK_NE(NULL, k1);

const v8::HeapGraphNode* a2 =

GetProperty(global2, v8::HeapGraphEdge::kProperty, "a");

CHECK_NE(NULL, a2);

- const v8::HeapGraphNode* e2 =

- GetProperty(a2, v8::HeapGraphEdge::kHidden, "1");

- CHECK_NE(NULL, e2);

const v8::HeapGraphNode* k2 =

- GetProperty(e2, v8::HeapGraphEdge::kInternal, "elements");

+ GetProperty(a2, v8::HeapGraphEdge::kInternal, "elements");

CHECK_NE(NULL, k2);

CHECK_EQ_SNAPSHOT_OBJECT_ID(a1->GetId(), a2->GetId());

- CHECK_EQ_SNAPSHOT_OBJECT_ID(e1->GetId(), e2->GetId());

CHECK_EQ_SNAPSHOT_OBJECT_ID(k1->GetId(), k2->GetId());

}

@@ -514,7 +508,7 @@ TEST(HeapEntryDominator) {

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

CHECK_NE(NULL, global);

const v8::HeapGraphNode* node6 =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "node6");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "node6");

CHECK_NE(NULL, node6);

const v8::HeapGraphNode* node5 =

GetProperty(node6, v8::HeapGraphEdge::kProperty, "a");

@@ -659,7 +653,7 @@ TEST(HeapSnapshotJSONSerialization) {

" GetChildPosByProperty("

" parsed.edges[parsed.nodes[edges_index_offset]"

" + edge_to_node_offset],"

- " \"b\", shortcut_type),\n"

+ " \"b\", property_type),\n"

" \"x\", property_type),"

" \"s\", property_type)");

CHECK(!string_obj_pos_val.IsEmpty());

@@ -1108,9 +1102,8 @@ TEST(HeapSnapshotImplicitReferences) {

v8::HeapProfiler::TakeSnapshot(v8_str("implicit_refs"));

const v8::HeapGraphNode* global_object = GetGlobalObject(snapshot);

- // Use kShortcut type to skip intermediate JSGlobalPropertyCell

const v8::HeapGraphNode* obj0 = GetProperty(

- global_object, v8::HeapGraphEdge::kShortcut, "root_object");

+ global_object, v8::HeapGraphEdge::kProperty, "root_object");

CHECK(obj0);

CHECK_EQ(v8::HeapGraphNode::kObject, obj0->GetType());

const v8::HeapGraphNode* obj1 = GetProperty(

@@ -1283,7 +1276,7 @@ TEST(GetHeapValue) {

env->Global()->GetPrototype().As<v8::Object>();

CHECK(js_global == global->GetHeapValue());

const v8::HeapGraphNode* obj = GetProperty(

- global, v8::HeapGraphEdge::kShortcut, "a");

+ global, v8::HeapGraphEdge::kProperty, "a");

CHECK(obj->GetHeapValue()->IsObject());

v8::Local<v8::Object> js_obj = js_global->Get(v8_str("a")).As<v8::Object>();

CHECK(js_obj == obj->GetHeapValue());

@@ -1312,7 +1305,7 @@ TEST(GetHeapValueForDeletedObject) {

v8::HeapProfiler::TakeSnapshot(v8_str("snapshot"));

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

const v8::HeapGraphNode* obj = GetProperty(

- global, v8::HeapGraphEdge::kShortcut, "a");

+ global, v8::HeapGraphEdge::kProperty, "a");

const v8::HeapGraphNode* prop = GetProperty(

obj, v8::HeapGraphEdge::kProperty, "p");

{

@@ -1399,7 +1392,7 @@ TEST(FastCaseGetter) {

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

CHECK_NE(NULL, global);

const v8::HeapGraphNode* obj1 =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "obj1");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "obj1");

CHECK_NE(NULL, obj1);

const v8::HeapGraphNode* getterFunction =

GetProperty(obj1, v8::HeapGraphEdge::kProperty, "get-propWithGetter");

@@ -1481,7 +1474,7 @@ TEST(SfiAndJsFunctionWeakRefs) {

const v8::HeapGraphNode* global = GetGlobalObject(snapshot);

CHECK_NE(NULL, global);

const v8::HeapGraphNode* fun =

- GetProperty(global, v8::HeapGraphEdge::kShortcut, "fun");

+ GetProperty(global, v8::HeapGraphEdge::kProperty, "fun");

CHECK(HasWeakEdge(fun));

const v8::HeapGraphNode* shared =

GetProperty(fun, v8::HeapGraphEdge::kInternal, "shared");

« src/profile-generator.cc ('K') | « src/profile-generator-inl.h ('k') | no next file » | no next file with comments »