Fix compile errors on Linux x64 and Windows.

test/cctest/test-heap-profiler.cc

 // Copyright 2009 the V8 project authors. All rights reserved.
 //
 // Tests for heap profiler
 
 #ifdef ENABLE_LOGGING_AND_PROFILING
 
 #include "v8.h"
 #include "heap-profiler.h"
 #include "snapshot.h"
 #include "string-stream.h"
@@ skipping 611 matching lines @@
         lazy_references_x = true;
         break;
       }
     }
   }
   CHECK(compiled_references_x);
   CHECK(!lazy_references_x);
 }
 
 
+// Trying to introduce a check helper for uint64_t causes many
+// overloading ambiguities, so it seems easier just to cast
+// them to a signed type.
+#define CHECK_EQ_UINT64_T(a, b) \
+  CHECK_EQ(static_cast<int64_t>(a), static_cast<int64_t>(b))
+
 TEST(HeapEntryIdsAndGC) {
   v8::HandleScope scope;
   LocalContext env;
 
   CompileAndRunScript(
       "function A() {}\n"
       "function B(x) { this.x = x; }\n"
       "var a = new A();\n"
       "var b = new B(a);");
   const v8::HeapSnapshot* snapshot1 =
       v8::HeapProfiler::TakeSnapshot(v8::String::New("s1"));
 
   i::Heap::CollectAllGarbage(true);  // Enforce compaction.
 
   const v8::HeapSnapshot* snapshot2 =
       v8::HeapProfiler::TakeSnapshot(v8::String::New("s2"));
 
   const v8::HeapGraphNode* global1 = GetGlobalObject(snapshot1);
   const v8::HeapGraphNode* global2 = GetGlobalObject(snapshot2);
-  CHECK_NE(0, global1->GetId());
-  CHECK_EQ(global1->GetId(), global2->GetId());
+  CHECK(global1->GetId() != 0);
+  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_NE(0, A1->GetId());
-  CHECK_EQ(A1->GetId(), A2->GetId());
+  CHECK(A1->GetId() != 0);
+  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_NE(0, B1->GetId());
-  CHECK_EQ(B1->GetId(), B2->GetId());
+  CHECK(B1->GetId() != 0);
+  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_NE(0, a1->GetId());
-  CHECK_EQ(a1->GetId(), a2->GetId());
+  CHECK(a1->GetId() != 0);
+  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_NE(0, b1->GetId());
-  CHECK_EQ(b1->GetId(), b2->GetId());
+  CHECK(b1->GetId() != 0);
+  CHECK_EQ_UINT64_T(b1->GetId(), b2->GetId());
 }
 
 
 TEST(HeapSnapshotsDiff) {
   v8::HandleScope scope;
   LocalContext env;
 
   CompileAndRunScript(
       "function A() {}\n"
       "function B(x) { this.x = x; }\n"
@@ skipping 47 matching lines @@
       v8::String::AsciiValue node_name(node->GetName());
       if (strcmp(*node_name, "A") == 0) {
         CHECK(IsNodeRetainedAs(node, v8::HeapGraphEdge::PROPERTY, "a"));
         CHECK(!found_A_del);
         found_A_del = true;
         s2_A_id = node->GetId();
       }
     }
   }
   CHECK(found_A_del);
-  CHECK_NE(0, s1_A_id);
+  CHECK(s1_A_id != 0);
   CHECK(s1_A_id != s2_A_id);
 }
 
 #endif  // ENABLE_LOGGING_AND_PROFILING