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

runtime/vm/stack_frame.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/stack_frame.h"
 
 #include "vm/assembler.h"
 #include "vm/deopt_instructions.h"
 #include "vm/isolate.h"
 #include "vm/object.h"
@@ skipping 386 matching lines @@
 void InlinedFunctionsIterator::Advance() {
   // Iterate over the deopt instructions and determine the inlined
   // functions if any and iterate over them.
   ASSERT(!Done());
 
   if (deopt_info_.IsNull()) {
     SetDone();
     return;
   }
 
-  Function& func = Function::Handle();
   ASSERT(deopt_instructions_.length() != 0);
   while (index_ < deopt_instructions_.length()) {
     DeoptInstr* deopt_instr = deopt_instructions_[index_++];
     if (deopt_instr->kind() == DeoptInstr::kRetAddress) {
-      pc_ = DeoptInstr::GetRetAddress(deopt_instr, object_table_, &func);
-      code_ = func.unoptimized_code();
-      function_ = func.raw();
+      pc_ = DeoptInstr::GetRetAddress(deopt_instr, object_table_, &code_);
+      function_ = code_.function();
       return;
     }
   }
   SetDone();
 }
 
 
 // Finds the potential offset for the current function's FP if the
 // current frame were to be deoptimized.
 intptr_t InlinedFunctionsIterator::GetDeoptFpOffset() const {
   ASSERT(deopt_instructions_.length() != 0);
   for (intptr_t index = index_;
        index < deopt_instructions_.length();
        index++) {
     DeoptInstr* deopt_instr = deopt_instructions_[index];
     if (deopt_instr->kind() == DeoptInstr::kCallerFp) {
       return (index - num_materializations_);
     }
   }
   UNREACHABLE();
   return 0;
 }
 
 
 }  // namespace dart