Required rename on x64 platform.

runtime/vm/code_patcher_x64.cc

-// Copyright (c) 2011, the Dart project authors.  Please see the AUTHORS file
+// 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"
 #include "vm/instructions.h"
@@ skipping 143 matching lines @@
     *b = tmp;
     a++;
     b++;
   }
 }
 
 
 // The patch code buffer contains the jump code sequence which will be inserted
 // at entry point.
 void CodePatcher::PatchEntry(const Code& code) {
-  Jump jmp_entry(code.EntryPoint());
+  JumpPattern jmp_entry(code.EntryPoint());
   ASSERT(!jmp_entry.IsValid());
   const uword patch_buffer = code.GetPatchCodePc();
   ASSERT(patch_buffer != 0);
-  Jump jmp_patch(patch_buffer);
+  JumpPattern jmp_patch(patch_buffer);
   ASSERT(jmp_patch.IsValid());
   const uword jump_target = jmp_patch.TargetAddress();
   SwapCode(jmp_patch.pattern_length_in_bytes(),
            reinterpret_cast<char*>(code.EntryPoint()),
            reinterpret_cast<char*>(patch_buffer));
   jmp_entry.SetTargetAddress(jump_target);
 }
 
 
 // The entry point is a jump code sequence, the patch code buffer contains
 // original code, the entry point contains the jump code sequence.
 void CodePatcher::RestoreEntry(const Code& code) {
-  Jump jmp_entry(code.EntryPoint());
+  JumpPattern jmp_entry(code.EntryPoint());
   ASSERT(jmp_entry.IsValid());
   const uword jump_target = jmp_entry.TargetAddress();
   const uword patch_buffer = code.GetPatchCodePc();
   ASSERT(patch_buffer != 0);
   // 'patch_buffer' contains original entry code.
-  Jump jmp_patch(patch_buffer);
+  JumpPattern jmp_patch(patch_buffer);
   ASSERT(!jmp_patch.IsValid());
   SwapCode(jmp_patch.pattern_length_in_bytes(),
            reinterpret_cast<char*>(code.EntryPoint()),
            reinterpret_cast<char*>(patch_buffer));
   ASSERT(jmp_patch.IsValid());
   jmp_patch.SetTargetAddress(jump_target);
 }
 
 
 bool CodePatcher::CodeIsPatchable(const Code& code) {
-  Jump jmp_entry(code.EntryPoint());
+  JumpPattern jmp_entry(code.EntryPoint());
   if (code.Size() < (jmp_entry.pattern_length_in_bytes() * 2)) {
     return false;
   }
   uword limit = code.EntryPoint() + jmp_entry.pattern_length_in_bytes();
   for (intptr_t i = 0; i < code.pointer_offsets_length(); i++) {
     const uword addr = code.GetPointerOffsetAt(i) + code.EntryPoint();
     if (addr < limit) {
       return false;
     }
   }
@@ skipping 30 matching lines @@
 }
 
 
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return DartCallPattern::kCallPatternSize;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64