Fix for issue 7757

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 "vm/dart_api_impl.h"
 #include "vm/dart_entry.h"
 #include "vm/debugger.h"
 #include "vm/flags.h"
@@ skipping 24 matching lines @@
                                  const GrowableObjectArray& code_list,
                                  const GrowableObjectArray& pc_offset_list) {
   StackFrameIterator frames(StackFrameIterator::kDontValidateFrames);
   StackFrame* frame = frames.NextFrame();
   ASSERT(frame != NULL);  // We expect to find a dart invocation frame.
   Function& func = Function::Handle();
   Code& code = Code::Handle();
   Smi& offset = Smi::Handle();
   while (!frame->IsEntryFrame()) {
     if (frame->IsDartFrame()) {
-      func = frame->LookupDartFunction();
       code = frame->LookupDartCode();
-      offset = Smi::New(frame->pc() - code.EntryPoint());
-      func_list.Add(func);
-      code_list.Add(code);
-      pc_offset_list.Add(offset);
+      if (code.is_optimized()) {
+        // For optimized frames, extract all the inlined functions if any
+        // into the stack trace.
+        InlinedFunctionsInDartFrameIterator optimized_frames(frame);
+        while (true) {
+          uword pc = 0;
+          func = optimized_frames.GetNextFunction(&pc);
+          if (func.IsNull()) {
+            break;
+          }
+          ASSERT(pc != 0);
+          code = func.unoptimized_code();
+          offset = Smi::New(pc - code.EntryPoint());
+          func_list.Add(func);
+          code_list.Add(code);
+          pc_offset_list.Add(offset);
+        }
+      } else {
+        offset = Smi::New(frame->pc() - code.EntryPoint());
+        func = code.function();
+        func_list.Add(func);
+        code_list.Add(code);
+        pc_offset_list.Add(offset);
+      }
       if (frame->FindExceptionHandler(handler_pc)) {
         *handler_sp = frame->sp();
         *handler_fp = frame->fp();
         return true;
       }
     }
     frame = frames.NextFrame();
     ASSERT(frame != NULL);
   }
   ASSERT(frame->IsEntryFrame());
@@ skipping 384 matching lines @@
     case kIsolateUnhandledException:
       library = Library::IsolateLibrary();
       class_name = &Symbols::IsolateUnhandledException();
       break;
   }
 
   return DartLibraryCalls::ExceptionCreate(library, *class_name, arguments);
 }
 
 }  // namespace dart