Revert "Fix compilation on Win after r5867.". This breaks Linux.

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@5870 ce2b1a6d-e550-0410-aec6-3dcde31c8c00

diff --git a/src/profile-generator-inl.h b/src/profile-generator-inl.h
index c8c98cc..71de2d1 100644 (file)
--- a/src/profile-generator-inl.h
+++ b/src/profile-generator-inl.h
@@ -122,11 +122,6 @@ CodeEntry* ProfileGenerator::EntryForVMState(StateTag tag) {
 }
 
 
-inline uint64_t HeapEntry::id() {
-  return *(reinterpret_cast<uint64_t*>(&id_));
-}
-
-
 template<class Visitor>
 void HeapEntriesMap::UpdateEntries(Visitor* visitor) {
   for (HashMap::Entry* p = entries_.Start();

diff --git a/src/profile-generator.cc b/src/profile-generator.cc
index 8a871a5..9f475a4 100644 (file)
--- a/src/profile-generator.cc
+++ b/src/profile-generator.cc
@@ -870,7 +870,7 @@ void HeapEntry::Init(HeapSnapshot* snapshot,
   type_ = type;
   painted_ = kUnpainted;
   name_ = name;
-  *(reinterpret_cast<uint64_t*>(&id_)) = id;
+  id_ = id;
   self_size_ = self_size;
   retained_size_ = 0;
   children_count_ = children_count;
@@ -952,7 +952,7 @@ void HeapEntry::PaintAllReachable() {
 
 
 void HeapEntry::Print(int max_depth, int indent) {
-  OS::Print("%6d %6d [%llu] ", self_size(), RetainedSize(false), id());
+  OS::Print("%6d %6d [%llu] ", self_size(), RetainedSize(false), id_);
   if (type() != kString) {
     OS::Print("%s %.40s\n", TypeAsString(), name_);
   } else {

diff --git a/src/profile-generator.h b/src/profile-generator.h
index 0773a1e..7f8ffbd 100644 (file)
--- a/src/profile-generator.h
+++ b/src/profile-generator.h
@@ -526,7 +526,7 @@ class HeapEntry BASE_EMBEDDED {
   HeapSnapshot* snapshot() { return snapshot_; }
   Type type() { return static_cast<Type>(type_); }
   const char* name() { return name_; }
-  uint64_t id();
+  uint64_t id() { return id_; }
   int self_size() { return self_size_; }
   int retained_size() { return retained_size_; }
   void add_retained_size(int size) { retained_size_ += size; }
@@ -615,11 +615,8 @@ class HeapEntry BASE_EMBEDDED {
   };
   HeapEntry* dominator_;
   HeapSnapshot* snapshot_;
-  struct Id {
-    uint32_t id1_;
-    uint32_t id2_;
-  } id_;  // This is to avoid extra padding of 64-bit value on MSVC.
   const char* name_;
+  uint64_t id_;
 
   // Paints used for exact retained sizes calculation.
   static const unsigned kUnpainted = 0;