Merged r14035 into trunk branch.

src/heap.cc

Index: src/heap.cc
diff --git a/src/heap.cc b/src/heap.cc
index c57014f4b644d712b9ce85cc3557ac4e79a902dc..949661dd1bcca3e2bfc9957f2919aa4d15b997af 100644
--- a/src/heap.cc
+++ b/src/heap.cc
@@ -3880,7 +3880,7 @@ MaybeObject* Heap::CopyCode(Code* code, Vector<byte> reloc_info) {
   Address new_addr = reinterpret_cast<HeapObject*>(result)->address();
 
   // Copy header and instructions.
-  CopyBytes(new_addr, old_addr, relocation_offset);
+  CopyBytes(new_addr, old_addr, static_cast<int>(relocation_offset));
 
   Code* new_code = Code::cast(result);
   new_code->set_relocation_info(ByteArray::cast(reloc_info_array));