Fix issue 18834. Collect stack trace before the frame is prepared for OSR.

runtime/vm/debugger.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/debugger.h"
 
 #include "include/dart_api.h"
 
 #include "vm/code_generator.h"
 #include "vm/code_patcher.h"
@@ skipping 1168 matching lines @@
     DebuggerEvent event(kBreakpointResolved);
     event.breakpoint = bpt;
     (*event_handler_)(&event);
   }
 }
 
 
 ActivationFrame* Debugger::CollectDartFrame(Isolate* isolate,
                                             uword pc,
                                             StackFrame* frame,
-                                            const Code& code_param,
+                                            const Code& code,
                                             const Array& deopt_frame,
                                             intptr_t deopt_frame_offset,
                                             ActivationFrame* callee_activation,
                                             const Context& entry_ctx) {
-  // TODO(turnidge): Remove the workaround below once...
-  //    https://code.google.com/p/dart/issues/detail?id=18384
-  // ...is fixed.
-  Code& code = Code::Handle(isolate);
-  code = code_param.raw();
-  if (!code.ContainsInstructionAt(pc)) {
-    code = Code::LookupCode(pc);
-    ASSERT(!code.IsNull());
-    ASSERT(code.ContainsInstructionAt(pc));
-  }
-
+  ASSERT(code.ContainsInstructionAt(pc));
   // We provide either a callee activation or an entry context.  Not both.
   ASSERT(((callee_activation != NULL) && entry_ctx.IsNull()) ||
          ((callee_activation == NULL) && !entry_ctx.IsNull()));
   ActivationFrame* activation =
       new ActivationFrame(pc, frame->fp(), frame->sp(), code,
                           deopt_frame, deopt_frame_offset);
 
   // Is there a closure call at the current PC?
   //
   // We can't just check the callee_activation to see if it is a
@@ skipping 1318 matching lines @@
 }
 
 
 void Debugger::RegisterCodeBreakpoint(CodeBreakpoint* bpt) {
   ASSERT(bpt->next() == NULL);
   bpt->set_next(code_breakpoints_);
   code_breakpoints_ = bpt;
 }
 
 }  // namespace dart