Index: test/cctest/test-heap-profiler.cc |
diff --git a/test/cctest/test-heap-profiler.cc b/test/cctest/test-heap-profiler.cc |
index b5279e6f54df4bad635860e530807bbd484a1a7f..1819aa461ecef384ffe331ca21de37def4f48b4c 100644 |
--- a/test/cctest/test-heap-profiler.cc |
+++ b/test/cctest/test-heap-profiler.cc |
@@ -634,6 +634,11 @@ TEST(HeapSnapshotCodeObjects) { |
// them to a signed type. |
#define CHECK_EQ_UINT64_T(a, b) \ |
CHECK_EQ(static_cast<int64_t>(a), static_cast<int64_t>(b)) |
+#define CHECK_NE_UINT64_T(a, b) do \ |
+ { \ |
+ bool ne = a != b; \ |
+ CHECK(ne); \ |
+ } while (false) |
TEST(HeapEntryIdsAndGC) { |
v8::HandleScope scope; |
@@ -654,31 +659,31 @@ TEST(HeapEntryIdsAndGC) { |
const v8::HeapGraphNode* global1 = GetGlobalObject(snapshot1); |
const v8::HeapGraphNode* global2 = GetGlobalObject(snapshot2); |
- CHECK(global1->GetId() != 0); |
+ CHECK_NE_UINT64_T(0, global1->GetId()); |
CHECK_EQ_UINT64_T(global1->GetId(), global2->GetId()); |
const v8::HeapGraphNode* A1 = |
GetProperty(global1, v8::HeapGraphEdge::PROPERTY, "A"); |
const v8::HeapGraphNode* A2 = |
GetProperty(global2, v8::HeapGraphEdge::PROPERTY, "A"); |
- CHECK(A1->GetId() != 0); |
+ CHECK_NE_UINT64_T(0, A1->GetId()); |
CHECK_EQ_UINT64_T(A1->GetId(), A2->GetId()); |
const v8::HeapGraphNode* B1 = |
GetProperty(global1, v8::HeapGraphEdge::PROPERTY, "B"); |
const v8::HeapGraphNode* B2 = |
GetProperty(global2, v8::HeapGraphEdge::PROPERTY, "B"); |
- CHECK(B1->GetId() != 0); |
+ CHECK_NE_UINT64_T(0, B1->GetId()); |
CHECK_EQ_UINT64_T(B1->GetId(), B2->GetId()); |
const v8::HeapGraphNode* a1 = |
GetProperty(global1, v8::HeapGraphEdge::PROPERTY, "a"); |
const v8::HeapGraphNode* a2 = |
GetProperty(global2, v8::HeapGraphEdge::PROPERTY, "a"); |
- CHECK(a1->GetId() != 0); |
+ CHECK_NE_UINT64_T(0, a1->GetId()); |
CHECK_EQ_UINT64_T(a1->GetId(), a2->GetId()); |
const v8::HeapGraphNode* b1 = |
GetProperty(global1, v8::HeapGraphEdge::PROPERTY, "b"); |
const v8::HeapGraphNode* b2 = |
GetProperty(global2, v8::HeapGraphEdge::PROPERTY, "b"); |
- CHECK(b1->GetId() != 0); |
+ CHECK_NE_UINT64_T(0, b1->GetId()); |
CHECK_EQ_UINT64_T(b1->GetId(), b2->GetId()); |
} |
@@ -747,7 +752,7 @@ TEST(HeapSnapshotsDiff) { |
} |
} |
CHECK(found_A_del); |
- CHECK(s1_A_id != 0); |
+ CHECK_NE_UINT64_T(0, s1_A_id); |
CHECK(s1_A_id != s2_A_id); |
} |