Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(859)

Unified Diff: src/api.cc

Issue 10640012: Add a second kind of HandleScope that ties the lifetime of Handles created in its scope to the life… (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Address review. Created 8 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: src/api.cc
diff --git a/src/api.cc b/src/api.cc
index 0d88047aa212f4d0abcba489cae3247774e6e397..d8f47bf335cc3ba426258533c2086dbc8c550e6c 100644
--- a/src/api.cc
+++ b/src/api.cc
@@ -6377,18 +6377,41 @@ void HandleScopeImplementer::IterateThis(ObjectVisitor* v) {
// Iterate over all handles in the blocks except for the last.
for (int i = blocks()->length() - 2; i >= 0; --i) {
Object** block = blocks()->at(i);
- v->VisitPointers(block, &block[kHandleBlockSize]);
+ if (block == last_non_persistent_block_) {
+ ASSERT(last_non_persistent_handle_ >= block &&
+ last_non_persistent_handle_ <
+ (&block[kHandleBlockSize]));
+ v->VisitPointers(block, last_non_persistent_handle_);
+ } else {
+ v->VisitPointers(block, &block[kHandleBlockSize]);
+ }
}
// Iterate over live handles in the last block (if any).
if (!blocks()->is_empty()) {
v->VisitPointers(blocks()->last(), handle_scope_data_.next);
+ ASSERT(!has_compilation_block_ ||
danno 2012/06/24 11:07:03 I can't find has_compilation_block_ anywhere else.
+ blocks()->last() != last_non_persistent_block_);
}
if (!saved_contexts_.is_empty()) {
Object** start = reinterpret_cast<Object**>(&saved_contexts_.first());
v->VisitPointers(start, start + saved_contexts_.length());
}
+
+ for (PersistentExtensions* extension = persistent_extensions_head_; extension;
+ extension = extension->next) {
+ if (!extension->blocks.is_empty()) {
+ for (int i = 0; i < extension->blocks.length() - 1; i++) {
+ v->VisitPointers(extension->blocks[i],
+ &(extension->blocks[i][kHandleBlockSize]));
+ }
+ }
+ ASSERT(extension->last_block_end <
+ &extension->blocks.last()[kHandleBlockSize]);
+ ASSERT(extension->last_block_end >= extension->blocks.last());
+ v->VisitPointers(extension->blocks.last(), extension->last_block_end);
+ }
}
@@ -6407,4 +6430,54 @@ char* HandleScopeImplementer::Iterate(ObjectVisitor* v, char* storage) {
return storage + ArchiveSpacePerThread();
}
+
+HandleScopeImplementer::PersistentExtensions*
+HandleScopeImplementer::PersistExtensions(Object** prev_limit) {
+ PersistentExtensions* extension = new PersistentExtensions;
+ while (!blocks_.is_empty()) {
+ internal::Object** block_start = blocks_.last();
+ internal::Object** block_limit = block_start + kHandleBlockSize;
+
+ // We should not need to check for NoHandleAllocation here.
+ // Assert this.
+ ASSERT(prev_limit == block_limit ||
+ !(block_start <= prev_limit && prev_limit <= block_limit));
+ if (prev_limit == block_limit) break;
+ extension->blocks.Add(blocks_.last());
+ blocks_.RemoveLast();
+ }
+
+ ASSERT(!blocks_.is_empty() && prev_limit != NULL);
+
+ extension->next = persistent_extensions_head_;
+ extension->previous = NULL;
+ extension->last_block_end = isolate_->handle_scope_data()->next;
+ persistent_extensions_head_ = extension;
+ return extension;
+}
+
+
+void HandleScopeImplementer::ReleaseExtensions(
+ PersistentExtensions* extension) {
+ if (persistent_extensions_head_ == extension) {
+ persistent_extensions_head_ = extension->next;
+ }
+ if (extension->next != NULL) {
+ extension->next->previous = extension->previous;
+ }
+ if (extension->previous != NULL) {
+ extension->previous->next = extension->next;
+ }
+
+ for (int i = 0; i < extension->blocks.length(); i++) {
+#ifdef DEBUG
+ HandleScope::ZapRange(extension->blocks[i],
+ &extension->blocks[i][kHandleBlockSize]);
+#endif
+ if (spare_ != NULL) DeleteArray(spare_);
+ spare_ = extension->blocks[i];
+ }
+ delete extension;
+}
+
} } // namespace v8::internal

Powered by Google App Engine
This is Rietveld 408576698