Simplify representation of stack frames. Remove the special types DartFrame/StubFrame and instead u…

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/cpu.h"
 #include "vm/dart_entry.h"
 #include "vm/flags.h"
 #include "vm/object.h"
@@ skipping 10 matching lines @@
 static bool FindExceptionHandler(uword* handler_pc,
                                  uword* handler_sp,
                                  uword* handler_fp,
                                  GrowableArray<uword>* stack_frame_pcs) {
   StackFrameIterator frames(StackFrameIterator::kDontValidateFrames);
   StackFrame* frame = frames.NextFrame();
   ASSERT(frame != NULL);
   while (!frame->IsEntryFrame()) {
     if (frame->IsDartFrame()) {
       stack_frame_pcs->Add(frame->pc());
-      DartFrame* dart_frame = reinterpret_cast<DartFrame*>(frame);
-      if (dart_frame->FindExceptionHandler(handler_pc)) {
+      if (frame->FindExceptionHandler(handler_pc)) {
         *handler_sp = frame->sp();
         *handler_fp = frame->fp();
         return true;
       }
     }
     frame = frames.NextFrame();
     ASSERT(frame != NULL);
   }
   ASSERT(frame->IsEntryFrame());
   *handler_pc = frame->pc();
@@ skipping 73 matching lines @@
   }
   UNREACHABLE();
 }
 
 
 // Static helpers for allocating, initializing, and throwing an error instance.
 
 // Return the script of the Dart function that called the native entry or the
 // runtime entry. The frame iterator points to the callee.
 RawScript* Exceptions::GetCallerScript(DartFrameIterator* iterator) {
-  DartFrame* caller_frame = iterator->NextFrame();
+  StackFrame* caller_frame = iterator->NextFrame();
   ASSERT(caller_frame != NULL);
   const Function& caller = Function::Handle(caller_frame->LookupDartFunction());
   ASSERT(!caller.IsNull());
   const Class& caller_class = Class::Handle(caller.owner());
   return caller_class.script();
 }
 
 
 // Allocate a new instance of the given class name.
 // TODO(hausner): Rename this NewCoreInstance to call out the fact that
@@ skipping 215 matching lines @@
     case kIsolateSpawn:
       library = Library::IsolateLibrary();
       class_name = String::NewSymbol("IsolateSpawnException");
       break;
   }
 
   return DartLibraryCalls::ExceptionCreate(library, class_name, arguments);
 }
 
 }  // namespace dart