Fix asserts in StackFrameIterator which were effectively disabled

runtime/vm/exceptions.cc

 // Copyright (c) 2011, 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/exceptions.h"
 
 #include "platform/address_sanitizer.h"
 
 #include "lib/stacktrace.h"
 
@@ skipping 110 matching lines @@
     }
     cur_index_ = (StackTrace::kPreallocatedStackdepth - 1);
   }
   stacktrace_.SetCodeAtFrame(cur_index_, code);
   stacktrace_.SetPcOffsetAtFrame(cur_index_, offset);
   cur_index_ += 1;
 }
 
 
 static void BuildStackTrace(StackTraceBuilder* builder) {
-  StackFrameIterator frames(StackFrameIterator::kDontValidateFrames);
+  StackFrameIterator frames(StackFrameIterator::kDontValidateFrames,
+                            Thread::Current(),
+                            StackFrameIterator::kNoCrossThreadIteration);
   StackFrame* frame = frames.NextFrame();
   ASSERT(frame != NULL);  // We expect to find a dart invocation frame.
   Code& code = Code::Handle();
   Smi& offset = Smi::Handle();
   while (frame != NULL) {
     if (frame->IsDartFrame()) {
       code = frame->LookupDartCode();
       ASSERT(code.ContainsInstructionAt(frame->pc()));
       offset = Smi::New(frame->pc() - code.PayloadStart());
       builder->AddFrame(code, offset);
@@ skipping 20 matching lines @@
 class ExceptionHandlerFinder : public StackResource {
  public:
   explicit ExceptionHandlerFinder(Thread* thread)
       : StackResource(thread), thread_(thread), cache_(NULL), metadata_(NULL) {}
 
   // Iterate through the stack frames and try to find a frame with an
   // exception handler. Once found, set the pc, sp and fp so that execution
   // can continue in that frame. Sets 'needs_stacktrace' if there is no
   // cath-all handler or if a stack-trace is specified in the catch.
   bool Find() {
-    StackFrameIterator frames(StackFrameIterator::kDontValidateFrames);
+    StackFrameIterator frames(StackFrameIterator::kDontValidateFrames,
+                              Thread::Current(),
+                              StackFrameIterator::kNoCrossThreadIteration);
     StackFrame* frame = frames.NextFrame();
     if (frame == NULL) return false;  // No Dart frame.
     handler_pc_set_ = false;
     needs_stacktrace = false;
     bool is_catch_all = false;
     uword temp_handler_pc = kUwordMax;
     bool is_optimized = false;
     code_ = NULL;
     cache_ = thread_->isolate()->catch_entry_state_cache();
 
@@ skipping 157 matching lines @@
   bool handler_pc_set_;
   intptr_t* metadata_;      // MetaData generated from deopt.
   CatchEntryState cached_;  // Value of per PC MetaData cache.
   intptr_t pc_;             // Current pc in the handler frame.
 };
 
 
 static void FindErrorHandler(uword* handler_pc,
                              uword* handler_sp,
                              uword* handler_fp) {
-  StackFrameIterator frames(StackFrameIterator::kDontValidateFrames);
+  StackFrameIterator frames(StackFrameIterator::kDontValidateFrames,
+                            Thread::Current(),
+                            StackFrameIterator::kNoCrossThreadIteration);
   StackFrame* frame = frames.NextFrame();
   ASSERT(frame != NULL);
   while (!frame->IsEntryFrame()) {
     frame = frames.NextFrame();
     ASSERT(frame != NULL);
   }
   ASSERT(frame->IsEntryFrame());
   *handler_pc = frame->pc();
   *handler_sp = frame->sp();
   *handler_fp = frame->fp();
@@ skipping 32 matching lines @@
 
 static void ClearLazyDeopts(Thread* thread, uword frame_pointer) {
 #if !defined(TARGET_ARCH_DBC)
   MallocGrowableArray<PendingLazyDeopt>* pending_deopts =
       thread->isolate()->pending_deopts();
   if (pending_deopts->length() > 0) {
     // We may be jumping over frames scheduled for lazy deopt. Remove these
     // frames from the pending deopt table, but only after unmarking them so
     // any stack walk that happens before the stack is unwound will still work.
     {
-      DartFrameIterator frames(thread);
+      DartFrameIterator frames(thread,
+                               StackFrameIterator::kNoCrossThreadIteration);
       StackFrame* frame = frames.NextFrame();
       while ((frame != NULL) && (frame->fp() < frame_pointer)) {
         if (frame->IsMarkedForLazyDeopt()) {
           frame->UnmarkForLazyDeopt();
         }
         frame = frames.NextFrame();
       }
     }
 
 #if defined(DEBUG)
@@ skipping 248 matching lines @@
 
 
 // Allocate, initialize, and throw a TypeError or CastError.
 // If error_msg is not null, throw a TypeError, even for a type cast.
 void Exceptions::CreateAndThrowTypeError(TokenPosition location,
                                          const AbstractType& src_type,
                                          const AbstractType& dst_type,
                                          const String& dst_name,
                                          const String& bound_error_msg) {
   ASSERT(!dst_name.IsNull());  // Pass Symbols::Empty() instead.
-  Zone* zone = Thread::Current()->zone();
+  Thread* thread = Thread::Current();
+  Zone* zone = thread->zone();
   const Array& args = Array::Handle(zone, Array::New(4));
 
   ExceptionType exception_type =
       (bound_error_msg.IsNull() &&
        (dst_name.raw() == Symbols::InTypeCast().raw()))
           ? kCast
           : kType;
 
-  DartFrameIterator iterator;
+  DartFrameIterator iterator(thread,
+                             StackFrameIterator::kNoCrossThreadIteration);
   const Script& script = Script::Handle(zone, GetCallerScript(&iterator));
   intptr_t line = -1;
   intptr_t column = -1;
   ASSERT(!script.IsNull());
   if (location.IsReal()) {
     if (script.HasSource() || script.kind() == RawScript::kKernelTag) {
       script.GetTokenLocation(location, &line, &column);
     } else {
       script.GetTokenLocation(location, &line, NULL);
     }
@@ skipping 282 matching lines @@
   }
 
   Thread* thread = Thread::Current();
   NoReloadScope no_reload_scope(thread->isolate(), thread);
   return DartLibraryCalls::InstanceCreate(library, *class_name,
                                           *constructor_name, arguments);
 }
 
 
 }  // namespace dart