Add a stub_code_space in the heap alongside code_space so that stub code generation happens here an…

vm/stack_frame.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/stack_frame.h"
 
 #include "vm/isolate.h"
 #include "vm/object.h"
 #include "vm/object_store.h"
 #include "vm/os.h"
 #include "vm/raw_object.h"
 #include "vm/stub_code.h"
 #include "vm/visitor.h"
 
 namespace dart {
 
 bool StackFrame::FindRawCodeVisitor::FindObject(RawObject* obj) {
   return RawInstructions::ContainsPC(obj, pc_);
 }
 
 
 bool StackFrame::IsStubFrame() const {
-  if (Dart::vm_isolate()->heap()->CodeContains(pc())) {
+  if (Dart::vm_isolate()->heap()->StubCodeContains(pc())) {
     return true;  // Common stub code is generated in the VM heap.
   }
-  // We add a no gc scope to ensure that the code below does not trigger
-  // a GC as we are handling raw object references here. It is possible
-  // that the code is called while a GC is in progress, that is ok.
-  NoGCScope no_gc;
-  Isolate* isolate = Isolate::Current();
-  RawCode* code = StackFrame::LookupCode(isolate, pc());
-  return ((code != Code::null()) &&
-          (code->ptr()->function_ == Function::null()));
+  if (Isolate::Current()->heap()->StubCodeContains(pc())) {
+    return true;  // Common stub code is generated in the VM heap.
+  }
+  return false;
 }
 
 
 void StackFrame::Print() const {
   OS::Print("[%-8s : sp(%p) ]\n", GetName(), sp());
 }
 
 
 RawCode* StackFrame::LookupCode(Isolate* isolate, uword pc) {
   // TODO(asiva): Need to add a data structure for storing a (pc, code
@@ skipping 118 matching lines @@
         *handler_pc = handlers.HandlerPC(j);
         return true;
       }
     }
   }
   return false;
 }
 
 
 bool StackFrame::IsValid() const {
-  if (IsEntryFrame() || IsExitFrame()) {
+  if (IsEntryFrame() || IsExitFrame() || IsStubFrame()) {
     return true;
   }
-  if (Dart::vm_isolate()->heap()->CodeContains(pc())) {
-    return true;  // Common stub code is generated in the VM heap.
-  }
   return (StackFrame::LookupCode(Isolate::Current(), pc()) != Code::null());
 }
 
 
 StackFrameIterator::StackFrameIterator(bool validate)
     : validate_(validate), entry_(), exit_(), current_frame_(NULL) {
   SetupLastExitFrameData();  // Setup data for last exit frame.
 }
 
 
@@ skipping 64 matching lines @@
 EntryFrame* StackFrameIterator::NextEntryFrame() {
   ASSERT(!frames_.HasNext());
   entry_.sp_ = frames_.sp_;
   entry_.fp_ = frames_.fp_;
   SetupNextExitFrameData();  // Setup data for next exit frame in chain.
   ASSERT(entry_.IsValid());
   return &entry_;
 }
 
 }  // namespace dart