Fix for issue 7757

runtime/vm/code_generator.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/code_generator.h"
 
 #include "vm/assembler_macros.h"
 #include "vm/ast.h"
 #include "vm/bigint_operations.h"
 #include "vm/code_patcher.h"
@@ skipping 1414 matching lines @@
 #define DEOPT_REASON_ID_TO_TEXT(name) case kDeopt##name: return #name;
 DEOPT_REASONS(DEOPT_REASON_ID_TO_TEXT)
 #undef DEOPT_REASON_ID_TO_TEXT
     default:
       UNREACHABLE();
       return "";
   }
 }
 
 
-static void GetDeoptInfoAtPc(const Code& code,
-                             uword pc,
-                             DeoptInfo* deopt_info,
-                             DeoptReasonId* deopt_reason) {
-  ASSERT(code.is_optimized());
-  const Instructions& instructions = Instructions::Handle(code.instructions());
-  uword code_entry = instructions.EntryPoint();
-  const Array& table = Array::Handle(code.deopt_info_array());
-  ASSERT(!table.IsNull());
-  // Linear search for the PC offset matching the target PC.
-  intptr_t length = DeoptTable::GetLength(table);
-  Smi& offset = Smi::Handle();
-  Smi& reason = Smi::Handle();
-  for (intptr_t i = 0; i < length; ++i) {
-    DeoptTable::GetEntry(table, i, &offset, deopt_info, &reason);
-    if (pc == (code_entry + offset.Value())) {
-      *deopt_reason = static_cast<DeoptReasonId>(reason.Value());
-      return;
-    }
-  }
-  *deopt_info = DeoptInfo::null();
-  *deopt_reason = kDeoptUnknown;
-}
-
-
 static void DeoptimizeAt(const Code& optimized_code, uword pc) {
-  DeoptInfo& deopt_info = DeoptInfo::Handle();
-  DeoptReasonId deopt_reason = kDeoptUnknown;
-  GetDeoptInfoAtPc(optimized_code, pc, &deopt_info, &deopt_reason);
+  intptr_t deopt_reason = kDeoptUnknown;
+  const DeoptInfo& deopt_info =
+      DeoptInfo::Handle(optimized_code.GetDeoptInfoAtPc(pc, &deopt_reason));
   ASSERT(!deopt_info.IsNull());
   const Function& function = Function::Handle(optimized_code.function());
   const Code& unoptimized_code = Code::Handle(function.unoptimized_code());
   ASSERT(!unoptimized_code.IsNull());
   // The switch to unoptimized code may have already occured.
   if (function.HasOptimizedCode()) {
     function.SwitchToUnoptimizedCode();
   }
   // Patch call site (lazy deoptimization is quite rare, patching it twice
   // is not a performance issue).
@@ skipping 112 matching lines @@
   CopySavedRegisters(saved_registers_address);
 
   // Get optimized code and frame that need to be deoptimized.
   DartFrameIterator iterator(last_fp);
   StackFrame* caller_frame = iterator.NextFrame();
   ASSERT(caller_frame != NULL);
   const Code& optimized_code = Code::Handle(caller_frame->LookupDartCode());
   ASSERT(optimized_code.is_optimized());
 
 
-  DeoptInfo& deopt_info = DeoptInfo::Handle();
-  DeoptReasonId deopt_reason = kDeoptUnknown;
-  GetDeoptInfoAtPc(optimized_code, caller_frame->pc(), &deopt_info,
-                   &deopt_reason);
+  intptr_t deopt_reason = kDeoptUnknown;
+  const DeoptInfo& deopt_info = DeoptInfo::Handle(
+      optimized_code.GetDeoptInfoAtPc(caller_frame->pc(), &deopt_reason));
   ASSERT(!deopt_info.IsNull());
 
   CopyFrame(optimized_code, *caller_frame);
   if (FLAG_trace_deoptimization) {
     Function& function = Function::Handle(optimized_code.function());
-    OS::Print("Deoptimizing (reason %d '%s') at pc %#"Px" '%s' (count %d)\n",
+    OS::Print("Deoptimizing (reason %"Pd" '%s') at pc %#"Px" '%s' (count %d)\n",
         deopt_reason,
         DeoptReasonToText(deopt_reason),
         caller_frame->pc(),
         function.ToFullyQualifiedCString(),
         function.deoptimization_counter());
   }
 
   // Compute the stack size of the unoptimized frame.  For functions with
   // optional arguments the deoptimization info does not describe the
   // incoming arguments.
   const Function& function = Function::Handle(optimized_code.function());
   const intptr_t num_args =
       function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
   intptr_t unoptimized_stack_size =
       + deopt_info.TranslationLength() - num_args
       - 2;  // Subtract caller FP and PC.
   return unoptimized_stack_size * kWordSize;
 }
 END_LEAF_RUNTIME_ENTRY
 
 
 
 static intptr_t DeoptimizeWithDeoptInfo(const Code& code,
                                         const DeoptInfo& deopt_info,
                                         const StackFrame& caller_frame,
-                                        DeoptReasonId deopt_reason) {
+                                        intptr_t deopt_reason) {
   const intptr_t len = deopt_info.TranslationLength();
   GrowableArray<DeoptInstr*> deopt_instructions(len);
   const Array& deopt_table = Array::Handle(code.deopt_info_array());
   ASSERT(!deopt_table.IsNull());
   deopt_info.ToInstructions(deopt_table, &deopt_instructions);
 
   intptr_t* start = reinterpret_cast<intptr_t*>(caller_frame.sp() - kWordSize);
   const Function& function = Function::Handle(code.function());
   const intptr_t num_args =
       function.HasOptionalParameters() ? 0 : function.num_fixed_parameters();
   intptr_t to_frame_size =
       1  // Deoptimized function's return address.
       + (caller_frame.fp() - caller_frame.sp()) / kWordSize
       + 3  // caller-fp, pc, pc-marker.
       + num_args;
   DeoptimizationContext deopt_context(start,
                                       to_frame_size,
                                       Array::Handle(code.object_table()),
                                       num_args,
-                                      deopt_reason);
+                                      static_cast<DeoptReasonId>(deopt_reason));
   for (intptr_t to_index = len - 1; to_index >= 0; to_index--) {
     deopt_instructions[to_index]->Execute(&deopt_context, to_index);
   }
   if (FLAG_trace_deoptimization_verbose) {
     for (intptr_t i = 0; i < len; i++) {
       OS::Print("*%"Pd". [%p] %#014"Px" [%s]\n",
           i,
           &start[i],
           start[i],
           deopt_instructions[i]->ToCString());
@@ skipping 17 matching lines @@
   const Function& function = Function::Handle(optimized_code.function());
   ASSERT(!function.IsNull());
   const Code& unoptimized_code = Code::Handle(function.unoptimized_code());
   ASSERT(!optimized_code.IsNull() && optimized_code.is_optimized());
   ASSERT(!unoptimized_code.IsNull() && !unoptimized_code.is_optimized());
 
   intptr_t* frame_copy = isolate->deopt_frame_copy();
   intptr_t* cpu_registers_copy = isolate->deopt_cpu_registers_copy();
   double* xmm_registers_copy = isolate->deopt_xmm_registers_copy();
 
-  DeoptInfo& deopt_info = DeoptInfo::Handle();
-  DeoptReasonId deopt_reason = kDeoptUnknown;
-  GetDeoptInfoAtPc(optimized_code, caller_frame->pc(), &deopt_info,
-                   &deopt_reason);
+  intptr_t deopt_reason = kDeoptUnknown;
+  const DeoptInfo& deopt_info = DeoptInfo::Handle(
+      optimized_code.GetDeoptInfoAtPc(caller_frame->pc(), &deopt_reason));
   ASSERT(!deopt_info.IsNull());
 
-  const intptr_t caller_fp =
-      DeoptimizeWithDeoptInfo(optimized_code, deopt_info, *caller_frame,
-                              deopt_reason);
+  const intptr_t caller_fp = DeoptimizeWithDeoptInfo(optimized_code,
+                                                     deopt_info,
+                                                     *caller_frame,
+                                                     deopt_reason);
 
   isolate->SetDeoptFrameCopy(NULL, 0);
   isolate->set_deopt_cpu_registers_copy(NULL);
   isolate->set_deopt_xmm_registers_copy(NULL);
   delete[] frame_copy;
   delete[] cpu_registers_copy;
   delete[] xmm_registers_copy;
 
   return caller_fp;
 }
@@ skipping 80 matching lines @@
     return;
   }
   HeapTrace* heap_trace = Isolate::Current()->heap()->trace();
   heap_trace->TraceStoreIntoObject(RawObject::ToAddr(object),
                                    field_addr,
                                    RawObject::ToAddr(value));
 }
 END_LEAF_RUNTIME_ENTRY
 
 }  // namespace dart