Added macros OBJECT_IMPLEMENTATION and FINAL_OBJECT_IMPLEMENTATION

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 136 matching lines @@
 bool CodePatcher::IsDartCall(uword return_address) {
   return DartCallPattern::IsValid(return_address);
 }
 
 
 uword CodePatcher::GetInstanceCallAt(uword return_address,
                                      ICData* ic_data,
                                      Array* arguments_descriptor) {
   InstanceCall call(return_address);
   if (ic_data != NULL) {
-    *ic_data |= call.ic_data();
+    *ic_data ^= call.ic_data();
   }
   if (arguments_descriptor != NULL) {
     *arguments_descriptor ^= call.arguments_descriptor();
   }
   return call.target();
 }
 
 
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return DartCallPattern::kCallPatternSize;
 }
 
 
 void CodePatcher::InsertCallAt(uword start, uword target) {
   *reinterpret_cast<uint8_t*>(start) = 0xE8;
   ShortCallPattern call(start);
   call.SetTargetAddress(target);
   CPU::FlushICache(start, ShortCallPattern::InstructionLength());
 }
 
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64