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

runtime/vm/code_patcher_ia32.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_IA32.
 #if defined(TARGET_ARCH_IA32)
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/cpu.h"
@@ skipping 213 matching lines @@
 void CodePatcher::InsertCallAt(uword start, uword target) {
   // The inserted call should not overlap the lazy deopt jump code.
   ASSERT(start + CallPattern::InstructionLength() <= target);
   *reinterpret_cast<uint8_t*>(start) = 0xE8;
   CallPattern call(start);
   call.SetTargetAddress(target);
   CPU::FlushICache(start, CallPattern::InstructionLength());
 }
 
 
-uword CodePatcher::GetInstanceCallAt(uword return_address,
-                                     const Code& code,
-                                     ICData* ic_data) {
+uword CodePatcher::GetInstanceCallAt(
+    uword return_address, const Code& code, ICData* ic_data) {
   ASSERT(code.ContainsInstructionAt(return_address));
   InstanceCall call(return_address);
   if (ic_data != NULL) {
     *ic_data ^= call.ic_data();
   }
   return call.target();
 }
 
 
-RawFunction* CodePatcher::GetUnoptimizedStaticCallTargetAt(
-    uword return_address, const Code& code) {
+RawFunction* CodePatcher::GetUnoptimizedStaticCallAt(
+    uword return_address, const Code& code, ICData* ic_data_result) {

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

why not keep the param name consistent with GetInstanceCallAt
(i.e use ic_data instead of ic_data_result)
Here and elsewhere too.

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

Discussed offline. Leaving as it is, since we need a different ic_data object
inside the function.

   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);
 }
 
 
 intptr_t CodePatcher::InstanceCallSizeInBytes() {
   return InstanceCall::kNumInstructions * InstanceCall::kInstructionSize;
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_IA32