Change the order of loading ic_data and arguments descriptor prior to an

runtime/vm/instructions_arm.cc

 // Copyright (c) 2013, 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_ARM.
 #if defined(TARGET_ARCH_ARM)
 
 #include "vm/constants_arm.h"
 #include "vm/cpu.h"
 #include "vm/instructions.h"
 #include "vm/object.h"
 
 namespace dart {
 
 CallPattern::CallPattern(uword pc, const Code& code)
     : end_(reinterpret_cast<uword*>(pc)),
       target_address_pool_index_(-1),
       args_desc_load_end_(-1),
       args_desc_(Array::Handle()),
       ic_data_load_end_(-1),
       ic_data_(ICData::Handle()),
       object_pool_(Array::Handle(code.ObjectPool())) {
   ASSERT(code.ContainsInstructionAt(pc));
   ASSERT(Back(1) == 0xe12fff3e);  // Last instruction: blx lr
   Register reg;
-  args_desc_load_end_ =
+  ic_data_load_end_ =
       DecodeLoadWordFromPool(1, &reg, &target_address_pool_index_);
   ASSERT(reg == LR);
 }
 
 
 uword CallPattern::Back(int n) const {
   ASSERT(n > 0);
   return *(end_ - n);
 }
 
@@ skipping 68 matching lines @@
   offset += kHeapObjectTag;
   ASSERT(Utils::IsAligned(offset, 4));
   *index = (offset - Array::data_offset())/4;
   return end;
 }
 
 
 RawICData* CallPattern::IcData() {
   if (ic_data_.IsNull()) {
     Register reg;
-    // Loading of the argument descriptor must be decoded first, if not already.
-    if (args_desc_.IsNull()) {
-      ic_data_load_end_ = DecodeLoadObject(
-          args_desc_load_end_, &reg, &args_desc_);
-      ASSERT(reg == R4);
-    }
-    DecodeLoadObject(ic_data_load_end_, &reg, &ic_data_);
+    args_desc_load_end_ = DecodeLoadObject(ic_data_load_end_, &reg, &ic_data_);
     ASSERT(reg == R5);
   }
   return ic_data_.raw();
 }
 
 
 RawArray* CallPattern::ArgumentsDescriptor() {
   if (args_desc_.IsNull()) {
+    IcData();  // Loading of the ic_data must be decoded first, if not already.
     Register reg;
-    ic_data_load_end_ = DecodeLoadObject(
-        args_desc_load_end_, &reg, &args_desc_);
+    DecodeLoadObject(args_desc_load_end_, &reg, &args_desc_);
     ASSERT(reg == R4);
   }
   return args_desc_.raw();
 }
 
 
 uword CallPattern::TargetAddress() const {
   ASSERT(target_address_pool_index_ >= 0);
   const Object& target_address =
       Object::Handle(object_pool_.At(target_address_pool_index_));
@@ skipping 41 matching lines @@
   uword movt = 0xe340c000 | ((target_hi >> 12) << 16) | (target_hi & 0xfff);
   *reinterpret_cast<uword*>(pc_ + (0 * Instr::kInstrSize)) = movw;
   *reinterpret_cast<uword*>(pc_ + (1 * Instr::kInstrSize)) = movt;
   CPU::FlushICache(pc_, 2 * Instr::kInstrSize);
 }
 
 }  // namespace dart
 
 #endif  // defined TARGET_ARCH_ARM