Remove deprecated deoptimization code.

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/code_patcher.h"
 #include "vm/compiler.h"
@@ skipping 1532 matching lines @@
         deopt_id,
         Function::Handle(optimized_code.function()).ToFullyQualifiedCString());
   }
 
   // Compute the stack size of unoptimized frame
   const Array& deopt_info_array =
       Array::Handle(optimized_code.deopt_info_array());
   ASSERT(!deopt_info_array.IsNull());
   DeoptInfo& deopt_info = DeoptInfo::Handle();
   deopt_info ^= deopt_info_array.At(deopt_index);
-  if (deopt_info.IsNull()) {
-    // TODO(srdjan): Deprecate.
-    // Include the space for return address.
-    intptr_t stack_size_in_bytes = caller_frame->fp() - caller_frame->sp();
-    return stack_size_in_bytes + kWordSize;
-  } else {
-    // For functions with optional argument deoptimization info does not
-    // describe incoming arguments.
-    const Function& function = Function::Handle(optimized_code.function());
-    const intptr_t num_args = (function.num_optional_parameters() > 0) ?
-        0 : function.num_fixed_parameters();
-    intptr_t unoptimized_stack_size =
-        + deopt_info.Length() - num_args
-        - 2;  // Subtract caller FP and PC.
-    return unoptimized_stack_size * kWordSize;
-  }
+  ASSERT(!deopt_info.IsNull());
+  // For functions with optional argument deoptimization info does not
+  // describe incoming arguments.
+  const Function& function = Function::Handle(optimized_code.function());
+  const intptr_t num_args = (function.num_optional_parameters() > 0) ?
+      0 : function.num_fixed_parameters();
+  intptr_t unoptimized_stack_size =
+      + deopt_info.Length() - num_args
+      - 2;  // Subtract caller FP and PC.
+  return unoptimized_stack_size * kWordSize;
 }
 END_LEAF_RUNTIME_ENTRY
 
 
 
 static void DeoptimizeWithDeoptInfo(const Code& code,
                                     const DeoptInfo& deopt_info,
                                     const StackFrame& caller_frame) {
   const intptr_t len = deopt_info.Length();
   GrowableArray<DeoptInstr*> deopt_instructions(len);
@@ skipping 59 matching lines @@
   if (FLAG_trace_deopt) {
     OS::Print("  -> continue at 0x%x\n", continue_at_pc);
     // TODO(srdjan): If we could allow GC, we could print the line where
     // deoptimization occured.
   }
   const Array& deopt_info_array =
       Array::Handle(optimized_code.deopt_info_array());
   ASSERT(!deopt_info_array.IsNull());
   DeoptInfo& deopt_info = DeoptInfo::Handle();
   deopt_info ^= deopt_info_array.At(deopt_index);
-  if (deopt_info.IsNull()) {
-    // TODO(srdjan): Deprecate.
-    const intptr_t deopt_frame_copy_size = isolate->deopt_frame_copy_size();
-    const intptr_t pc_marker_index =
-        ((caller_frame->fp() - caller_frame->sp()) / kWordSize);
-    // Patch the return PC and saved PC marker in frame to point to the
-    // unoptimized version.
-    frame_copy[0] = continue_at_pc;
-    frame_copy[pc_marker_index] =
-        unoptimized_code.EntryPoint() +
-        AssemblerMacros::kOffsetOfSavedPCfromEntrypoint;
-    intptr_t* start =
-        reinterpret_cast<intptr_t*>(caller_frame->sp() - kWordSize);
-    for (intptr_t i = 0; i < deopt_frame_copy_size; i++) {
-      if (FLAG_trace_deopt) {
-        OS::Print("%d. 0x%x\n", i, frame_copy[i]);
-      }
-      *(start + i) = frame_copy[i];
-    }
-  } else {
-    DeoptimizeWithDeoptInfo(optimized_code, deopt_info, *caller_frame);
-  }
+  ASSERT(!deopt_info.IsNull());
+  DeoptimizeWithDeoptInfo(optimized_code, deopt_info, *caller_frame);
 
   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;
 
   // Clear invocation counter so that the function gets optimized after
   // classes have been collected.
@@ skipping 22 matching lines @@
                 current->slot(),
                 current->value());
     }
 
     delete current;
   }
 }
 
 
 }  // namespace dart