Merge bleeding_edge revision (5922, 5934] to isolates branch....

src/type-info.cc

Index: src/type-info.cc
===================================================================
--- src/type-info.cc	(revision 6894)
+++ src/type-info.cc	(working copy)
@@ -339,12 +339,13 @@
               target->check_type() != RECEIVER_MAP_CHECK) continue;
           if (state != MONOMORPHIC && state != MEGAMORPHIC) continue;
         }
-        code_positions->Add(info->pc() - code->instruction_start());
+        code_positions->Add(
+            static_cast<int>(info->pc() - code->instruction_start()));
         source_positions->Add(position);
       }
     } else {
       ASSERT(RelocInfo::IsPosition(mode));
-      position = info->data();
+      position = static_cast<int>(info->data());
     }
   }
 }