[v8-dev] Fix build failures on Win64 since r14215. (issue 14075006)

[mstarzinger]

Reviewers: Sven Panne,

Description:
Fix build failures on Win64 since r14215.
R=svenpa...@chromium.org


Please review this at https://codereview.chromium.org/14075006/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files:
  M src/global-handles.cc
  M src/heap-snapshot-generator.cc


Index: src/global-handles.cc
diff --git a/src/global-handles.cc b/src/global-handles.cc
index  
48d752b721191b21b60205165a1083b41c07782c..8058f350cdb96f14ec79b775d25e1ba2eb260548  
100644
--- a/src/global-handles.cc
+++ b/src/global-handles.cc
@@ -588,7 +588,7 @@ bool GlobalHandles::IterateObjectGroups(ObjectVisitor*  
v,
   int surviving_info_index = 0;

   UniqueId current_group_id(0);
-  size_t current_group_start = 0;
+  int current_group_start = 0;
   bool any_group_was_visited = false;

   for (int i = 0; i <= object_groups_.length(); ++i) {
Index: src/heap-snapshot-generator.cc
diff --git a/src/heap-snapshot-generator.cc b/src/heap-snapshot-generator.cc
index  
4bc3fe1d7b58fd7a16e45d02dfc107f19aa47cf0..cfa2ad31251658be6e6e3222e7be431539435c69  
100644
--- a/src/heap-snapshot-generator.cc
+++ b/src/heap-snapshot-generator.cc
@@ -1948,9 +1948,9 @@ void NativeObjectsExplorer::FillRetainedObjects() {
   groups->Sort();
   infos->Sort();

-  int info_ix = 0;
+  int info_index = 0;
   UniqueId current_group_id(0);
-  size_t current_group_start = 0;
+  int current_group_start = 0;

   if (groups->length() > 0) {
     for (int i = 0; i <= groups->length(); ++i) {
@@ -1959,12 +1959,12 @@ void NativeObjectsExplorer::FillRetainedObjects() {
       if (i == groups->length() ||
           current_group_id != groups->at(i).id) {
         // Group detected: objects in indices [current_group_start, i[.
-        if (info_ix < infos->length() &&
-            infos->at(info_ix).id == groups->at(current_group_start).id) {
+        if (info_index < infos->length() &&
+            infos->at(info_index).id ==  
groups->at(current_group_start).id) {
           // Transfer the ownership of info.
           List<HeapObject*>* list =
-              GetListMaybeDisposeInfo(infos->at(info_ix).info);
-          infos->at(info_ix).info = NULL;
+              GetListMaybeDisposeInfo(infos->at(info_index).info);
+          infos->at(info_index).info = NULL;
           for (int j = current_group_start; j < i; ++j) {
             HeapObject* obj = HeapObject::cast(*(groups->at(j).object));
             list->Add(obj);


--
--
v8-dev mailing list
v8-dev@googlegroups.com
http://groups.google.com/group/v8-dev
--- 
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to v8-dev+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/groups/opt_out.