Skip to content

Commit

Permalink
api: introduce SealHandleScope
Browse files Browse the repository at this point in the history
When debugging Handle leaks in io.js we found it very convenient to be
able to Seal some specific (root in our case) scope to prevent Handle
allocations in it, and easily find leakage.

R=yangguo
BUG=

Review URL: https://codereview.chromium.org/1079713002

Cr-Commit-Position: refs/heads/master@{#27766}
  • Loading branch information
indutny authored and Commit bot committed Apr 10, 2015
1 parent 60dc309 commit 1f85559
Show file tree
Hide file tree
Showing 5 changed files with 73 additions and 4 deletions.
18 changes: 18 additions & 0 deletions include/v8.h
Original file line number Diff line number Diff line change
Expand Up @@ -1018,6 +1018,24 @@ class V8_EXPORT EscapableHandleScope : public HandleScope {
internal::Object** escape_slot_;
};

class V8_EXPORT SealHandleScope {
public:
SealHandleScope(Isolate* isolate);
~SealHandleScope();

private:
// Make it hard to create heap-allocated or illegal handle scopes by
// disallowing certain operations.
SealHandleScope(const SealHandleScope&);
void operator=(const SealHandleScope&);
void* operator new(size_t size);
void operator delete(void*, size_t);

internal::Isolate* isolate_;
int prev_level_;
internal::Object** prev_limit_;
};


// --- Special objects ---

Expand Down
21 changes: 21 additions & 0 deletions src/api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -674,6 +674,27 @@ i::Object** EscapableHandleScope::Escape(i::Object** escape_value) {
}


SealHandleScope::SealHandleScope(Isolate* isolate) {
i::Isolate* internal_isolate = reinterpret_cast<i::Isolate*>(isolate);

isolate_ = internal_isolate;
i::HandleScopeData* current = internal_isolate->handle_scope_data();
prev_limit_ = current->limit;
current->limit = current->next;
prev_level_ = current->level;
current->level = 0;
}


SealHandleScope::~SealHandleScope() {
i::HandleScopeData* current = isolate_->handle_scope_data();
DCHECK_EQ(0, current->level);
current->level = prev_level_;
DCHECK_EQ(current->next, current->limit);
current->limit = prev_limit_;
}


void Context::Enter() {
i::Handle<i::Context> env = Utils::OpenHandle(this);
i::Isolate* isolate = env->GetIsolate();
Expand Down
5 changes: 1 addition & 4 deletions src/api.h
Original file line number Diff line number Diff line change
Expand Up @@ -661,17 +661,14 @@ void HandleScopeImplementer::DeleteExtensions(internal::Object** prev_limit) {
while (!blocks_.is_empty()) {
internal::Object** block_start = blocks_.last();
internal::Object** block_limit = block_start + kHandleBlockSize;
#ifdef DEBUG

// SealHandleScope may make the prev_limit to point inside the block.
if (block_start <= prev_limit && prev_limit <= block_limit) {
#ifdef ENABLE_HANDLE_ZAPPING
internal::HandleScope::ZapRange(prev_limit, block_limit);
#endif
break;
}
#else
if (prev_limit == block_limit) break;
#endif

blocks_.RemoveLast();
#ifdef ENABLE_HANDLE_ZAPPING
Expand Down
1 change: 1 addition & 0 deletions test/cctest/cctest.status
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
# they don't fail then test.py has failed.
'test-serialize/TestThatAlwaysFails': [FAIL],
'test-serialize/DependentTestThatAlwaysFails': [FAIL],
'test-api/SealHandleScope': [FAIL],

# This test always fails. It tests that LiveEdit causes abort when turned off.
'test-debug/LiveEditDisabled': [FAIL],
Expand Down
32 changes: 32 additions & 0 deletions test/cctest/test-api.cc
Original file line number Diff line number Diff line change
Expand Up @@ -21900,3 +21900,35 @@ TEST(NewStringRangeError) {
}
free(buffer);
}


TEST(SealHandleScope) {
v8::Isolate* isolate = CcTest::isolate();
v8::HandleScope handle_scope(isolate);
LocalContext env;

v8::SealHandleScope seal(isolate);

// Should fail
v8::Local<v8::Object> obj = v8::Object::New(isolate);

USE(obj);
}


TEST(SealHandleScopeNested) {
v8::Isolate* isolate = CcTest::isolate();
v8::HandleScope handle_scope(isolate);
LocalContext env;

v8::SealHandleScope seal(isolate);

{
v8::HandleScope handle_scope(isolate);

// Should work
v8::Local<v8::Object> obj = v8::Object::New(isolate);

USE(obj);
}
}

0 comments on commit 1f85559

Please sign in to comment.