Simplify isolates access during stack iteration (WAS: Move SafeStackFrameIterator::active_count_...)

src/frames-inl.h

 // Copyright 2006-2008 the V8 project authors. All rights reserved.
 // Redistribution and use in source and binary forms, with or without
 // modification, are permitted provided that the following conditions are
 // met:
 //
 //     * Redistributions of source code must retain the above copyright
 //       notice, this list of conditions and the following disclaimer.
 //     * Redistributions in binary form must reproduce the above
 //       copyright notice, this list of conditions and the following
 //       disclaimer in the documentation and/or other materials provided
@@ skipping 71 matching lines @@
 }
 
 
 inline Address* StackHandler::pc_address() const {
   const int offset = StackHandlerConstants::kPCOffset;
   return reinterpret_cast<Address*>(address() + offset);
 }
 
 
 inline StackHandler* StackFrame::top_handler() const {
+  ASSERT((tagged_isolate_ptr_ & kIsolateTag) == 0);
   return iterator_->handler();
 }
 
 
+inline Isolate* StackFrame::isolate() const {

[Vitaly Repeshko, 2011/04/04 20:37:08]

I'm not convinced we need this tricky stuff. Usually we only create one frame
object per type and reuse them while a stack iterator is active, and we don't
care that much about the memory usage in the live edit case. Please use an
explicit isolate field.

[mnaganov (inactive), 2011/04/05 08:28:23]

I agree. I was in a premature optimization mood. Split into two fields.

+  if ((tagged_isolate_ptr_ & kIsolateTag) == 0) {
+    return iterator_->isolate();
+  } else {
+    return reinterpret_cast<Isolate*>(tagged_isolate_ptr_ & ~kIsolateTag);
+  }
+}
+
+
 inline Code* StackFrame::GetContainingCode(Isolate* isolate, Address pc) {
   return isolate->pc_to_code_cache()->GetCacheEntry(pc)->code;
 }
 
 
 inline Object* StandardFrame::GetExpression(int index) const {
   return Memory::Object_at(GetExpressionAddress(index));
 }
 
 
@@ skipping 55 matching lines @@
 
 
 inline Object* JavaScriptFrame::function() const {
   Object* result = function_slot_object();
   ASSERT(result->IsJSFunction());
   return result;
 }
 
 
 template<typename Iterator>
+inline JavaScriptFrameIteratorTemp<Iterator>::JavaScriptFrameIteratorTemp(
+    Isolate* isolate)
+    : iterator_(isolate) {
+  if (!done()) Advance();
+}
+
+template<typename Iterator>
 inline JavaScriptFrame* JavaScriptFrameIteratorTemp<Iterator>::frame() const {
   // TODO(1233797): The frame hierarchy needs to change. It's
   // problematic that we can't use the safe-cast operator to cast to
   // the JavaScript frame type, because we may encounter arguments
   // adaptor frames.
   StackFrame* frame = iterator_.frame();
   ASSERT(frame->is_java_script() || frame->is_arguments_adaptor());
   return static_cast<JavaScriptFrame*>(frame);
 }
 
 
 template<typename Iterator>
 JavaScriptFrameIteratorTemp<Iterator>::JavaScriptFrameIteratorTemp(
-    StackFrame::Id id) {
-  while (!done()) {
-    Advance();
-    if (frame()->id() == id) return;
-  }
+    Isolate* isolate, StackFrame::Id id)
+    : iterator_(isolate) {
+  AdvanceToId(id);
 }
 
 
 template<typename Iterator>
 void JavaScriptFrameIteratorTemp<Iterator>::Advance() {
   do {
     iterator_.Advance();
   } while (!iterator_.done() && !iterator_.frame()->is_java_script());
 }
 
 
 template<typename Iterator>
 void JavaScriptFrameIteratorTemp<Iterator>::AdvanceToArgumentsFrame() {
   if (!frame()->has_adapted_arguments()) return;
   iterator_.Advance();
   ASSERT(iterator_.frame()->is_arguments_adaptor());
 }
 
 
 template<typename Iterator>
+void JavaScriptFrameIteratorTemp<Iterator>::AdvanceToId(StackFrame::Id id) {
+  while (!done()) {
+    Advance();
+    if (frame()->id() == id) return;
+  }
+}
+
+
+template<typename Iterator>
 void JavaScriptFrameIteratorTemp<Iterator>::Reset() {
   iterator_.Reset();
   if (!done()) Advance();
 }
 
 
 } }  // namespace v8::internal
 
 #endif  // V8_FRAMES_INL_H_