Remove skip_static_calls_ as it uses an obsolete way to check for uncalled static calls. Will be re…

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 196 matching lines @@
   }
   return call.target();
 }
 
 
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return InstanceCall::kCallPatternSize;
 }
 
 
-RawFunction* CodePatcher::GetUnoptimizedStaticCallTargetAt(
-    uword return_address, const Code& code) {
-  ASSERT(code.ContainsInstructionAt(return_address));
-  UnoptimizedStaticCall static_call(return_address);
-  ICData& ic_data = ICData::Handle();
-  ic_data ^= static_call.ic_data();
-  return ic_data.GetTargetAt(0);
-}
-
-
 void CodePatcher::InsertCallAt(uword start, uword target) {
   // The inserted call should not overlap the lazy deopt jump code.
   ASSERT(start + ShortCallPattern::InstructionLength() <= target);
   *reinterpret_cast<uint8_t*>(start) = 0xE8;
   ShortCallPattern call(start);
   call.SetTargetAddress(target);
   CPU::FlushICache(start, ShortCallPattern::InstructionLength());
 }
 
 
+RawFunction* CodePatcher::GetUnoptimizedStaticCallAt(
+    uword return_address, const Code& code, ICData* ic_data_result) {
+  ASSERT(code.ContainsInstructionAt(return_address));
+  UnoptimizedStaticCall static_call(return_address);
+  ICData& ic_data = ICData::Handle();
+  ic_data ^= static_call.ic_data();
+  if (ic_data_result != NULL) {
+    *ic_data_result = ic_data.raw();
+  }
+  return ic_data.GetTargetAt(0);
+}

[siva, 2013/06/25 21:21:05]

This code seems pretty similar in all the target versions. Could they be
consolidated to be target independent?

[srdjan, 2013/06/25 21:26:08]

Next CL.

+
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_X64