Last cleanup int -> intptr_t. Also removed a hack.

runtime/vm/code_patcher_x64.cc

 // Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 #include "vm/globals.h"  // Needed here to get TARGET_ARCH_X64.
 #if defined(TARGET_ARCH_X64)
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/cpu.h"
@@ skipping 25 matching lines @@
         reinterpret_cast<uint8_t*>(return_address - kCallPatternSize);
     return (code_bytes[0] == 0x49) && (code_bytes[1] == 0x8B) &&
            (code_bytes[2] == 0x9F) &&
            (code_bytes[7] == 0x4D) && (code_bytes[8] == 0x8B) &&
            (code_bytes[9] == 0x9F) &&
            (code_bytes[14] == 0x41) && (code_bytes[15] == 0xFF) &&
            (code_bytes[16] == 0xD3);
   }
 
   RawObject* ic_data() const {
-    int index = InstructionPattern::IndexFromPPLoad(start_ + 3);
+    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 3);
     return object_pool_.At(index);
   }
 
   uword target() const {
-    int index = InstructionPattern::IndexFromPPLoad(start_ + 10);
+    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 10);
     return reinterpret_cast<uword>(object_pool_.At(index));
   }
 
   void set_target(uword target) const {
-    int index = InstructionPattern::IndexFromPPLoad(start_ + 10);
+    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 10);
     const Smi& smi = Smi::Handle(reinterpret_cast<RawSmi*>(target));
     object_pool_.SetAt(index, smi);
     // No need to flush the instruction cache, since the code is not modified.
   }
 
  private:
   uword start_;
   const Array& object_pool_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(UnoptimizedCall);
 };
@@ skipping 50 matching lines @@
   static bool IsValid(uword return_address) {
     uint8_t* code_bytes =
         reinterpret_cast<uint8_t*>(return_address - kCallPatternSize);
     return (code_bytes[0] == 0x4D) && (code_bytes[1] == 0x8B) &&
            (code_bytes[2] == 0x9F) &&
            (code_bytes[7] == 0x41) && (code_bytes[8] == 0xFF) &&
            (code_bytes[9] == 0xD3);
   }
 
   uword target() const {
-    int index = InstructionPattern::IndexFromPPLoad(start_ + 3);
+    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 3);
     return reinterpret_cast<uword>(object_pool_.At(index));
   }
 
   void set_target(uword target) const {
-    int index = InstructionPattern::IndexFromPPLoad(start_ + 3);
+    intptr_t index = InstructionPattern::IndexFromPPLoad(start_ + 3);
     const Smi& smi = Smi::Handle(reinterpret_cast<RawSmi*>(target));
     object_pool_.SetAt(index, smi);
     // No need to flush the instruction cache, since the code is not modified.
   }
 
  private:
   uword start_;
   const Array& object_pool_;
   DISALLOW_IMPLICIT_CONSTRUCTORS(StaticCall);
 };
@@ skipping 137 matching lines @@
 
 RawObject* CodePatcher::GetEdgeCounterAt(uword pc, const Code& code) {
   ASSERT(code.ContainsInstructionAt(pc));
   EdgeCounter counter(pc, code);
   return counter.edge_counter();
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64