Revert "Lazy deopt without code patching."

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/compiler.h"
 #include "vm/disassembler.h"
@@ skipping 105 matching lines @@
   }
 
   if (dest_options != kDestIsAllocated) {
     // kDestIsAllocated is used by the debugger to generate a stack trace
     // and does not signal a real deopt.
     deopt_start_micros_ = OS::GetCurrentMonotonicMicros();
   }
 
   if (FLAG_trace_deoptimization || FLAG_trace_deoptimization_verbose) {
     THR_Print(
-        "Deoptimizing (reason %d '%s') at "
-        "pc=%" Pp " fp=%" Pp " '%s' (count %d)\n",
+        "Deoptimizing (reason %d '%s') at pc %#" Px " '%s' (count %d)\n",
         deopt_reason(),
         DeoptReasonToCString(deopt_reason()),
         frame->pc(),
-        frame->fp(),
         function.ToFullyQualifiedCString(),
         function.deoptimization_counter());
   }
 }
 
 
 DeoptContext::~DeoptContext() {
   // Delete memory for source frame and registers.
   if (source_frame_is_allocated_) {
     delete[] source_frame_;
@@ skipping 196 matching lines @@
     if (!objects_only || IsObjectInstruction(instr->kind())) {
       instr->Execute(this, to_addr);
     } else {
       *reinterpret_cast<RawObject**>(to_addr) = Object::null();
     }
   }
 
   if (FLAG_trace_deoptimization_verbose) {
     for (intptr_t i = 0; i < frame_size; i++) {
       intptr_t* to_addr = GetDestFrameAddressAt(i);
-      THR_Print("*%" Pd ". [%p] 0x%" Px " [%s]\n",
-                i,
-                to_addr,
-                *to_addr,
-                deopt_instructions[i + (len - frame_size)]->ToCString());
+      OS::PrintErr("*%" Pd ". [%p] 0x%" Px " [%s]\n",
+                   i,
+                   to_addr,
+                   *to_addr,
+                   deopt_instructions[i + (len - frame_size)]->ToCString());
     }
   }
 }
 
 
 static void FillDeferredSlots(DeoptContext* deopt_context,
                               DeferredSlot** slot_list) {
   DeferredSlot* slot = *slot_list;
   *slot_list = NULL;
 
@@ skipping 30 matching lines @@
     DartFrameIterator iterator;
     StackFrame* top_frame = iterator.NextFrame();
     ASSERT(top_frame != NULL);
     const Code& code = Code::Handle(top_frame->LookupDartCode());
     const Function& top_function = Function::Handle(code.function());
     const Script& script = Script::Handle(top_function.script());
     const TokenPosition token_pos = code.GetTokenIndexOfPC(top_frame->pc());
     intptr_t line, column;
     script.GetTokenLocation(token_pos, &line, &column);
     String& line_string = String::Handle(script.GetLine(line));
-    THR_Print("  Function: %s\n", top_function.ToFullyQualifiedCString());
+    OS::PrintErr("  Function: %s\n", top_function.ToFullyQualifiedCString());
     char line_buffer[80];
     OS::SNPrint(line_buffer, sizeof(line_buffer), "  Line %" Pd ": '%s'",
                 line, line_string.ToCString());
-    THR_Print("%s\n", line_buffer);
-    THR_Print("  Deopt args: %" Pd "\n", deopt_arg_count);
+    OS::PrintErr("%s\n", line_buffer);
+    OS::PrintErr("  Deopt args: %" Pd "\n", deopt_arg_count);
   }
 
   return deopt_arg_count;
 }
 
 
 RawArray* DeoptContext::DestFrameAsArray() {
   ASSERT(dest_frame_ != NULL && dest_frame_is_allocated_);
   const Array& dest_array =
       Array::Handle(zone(), Array::New(dest_frame_size_));
@@ skipping 937 matching lines @@
                           Smi* offset,
                           TypedData* info,
                           Smi* reason) {
   intptr_t i = index * kEntrySize;
   *offset ^= table.At(i);
   *info ^= table.At(i + 1);
   *reason ^= table.At(i + 2);
 }
 
 }  // namespace dart