When deoptimizing use the code stored in the deopt information instead of current unoptimized code …

runtime/vm/deopt_instructions.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/deopt_instructions.h"
 
 #include "vm/assembler.h"
 #include "vm/code_patcher.h"
 #include "vm/intermediate_language.h"
 #include "vm/locations.h"
@@ skipping 1086 matching lines @@
 
 intptr_t DeoptInstr::DecodeSuffix(intptr_t source_index,
                                   intptr_t* info_number) {
   *info_number = DeoptSuffixInstr::InfoNumber::decode(source_index);
   return DeoptSuffixInstr::SuffixLength::decode(source_index);
 }
 
 
 uword DeoptInstr::GetRetAddress(DeoptInstr* instr,
                                 const Array& object_table,
-                                Function* func) {
+                                Code* code) {
   ASSERT(instr->kind() == kRetAddress);
   DeoptRetAddressInstr* ret_address_instr =
       static_cast<DeoptRetAddressInstr*>(instr);
   // The following assert may trigger when displaying a backtrace
   // from the simulator.
   ASSERT(Isolate::IsDeoptAfter(ret_address_instr->deopt_id()));
   ASSERT(!object_table.IsNull());
-  ASSERT(func != NULL);
-  Code& code = Code::Handle();
-  code ^= object_table.At(ret_address_instr->object_table_index());
-  ASSERT(!code.IsNull());
-  *func ^= code.function();
-  uword res = code.GetPcForDeoptId(ret_address_instr->deopt_id(),
-                                   PcDescriptors::kDeopt);
+  ASSERT(code != NULL);
+  *code ^= object_table.At(ret_address_instr->object_table_index());
+  ASSERT(!code->IsNull());
+  uword res = code->GetPcForDeoptId(ret_address_instr->deopt_id(),
+                                    PcDescriptors::kDeopt);
   ASSERT(res != 0);
   return res;
 }
 
 
 DeoptInstr* DeoptInstr::Create(intptr_t kind_as_int, intptr_t source_index) {
   Kind kind = static_cast<Kind>(kind_as_int);
   switch (kind) {
     case kStackSlot: return new DeoptStackSlotInstr(source_index);
     case kDoubleStackSlot: return new DeoptDoubleStackSlotInstr(source_index);
@@ skipping 347 matching lines @@
                           Smi* offset,
                           DeoptInfo* info,
                           Smi* reason) {
   intptr_t i = index * kEntrySize;
   *offset ^= table.At(i);
   *info ^= table.At(i + 1);
   *reason ^= table.At(i + 2);
 }
 
 }  // namespace dart