Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

src: turn inspector raw pointer into unique_ptr #16974

Closed
wants to merge 1 commit into from
Closed

src: turn inspector raw pointer into unique_ptr #16974

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions src/env-inl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,8 +326,9 @@ inline Environment::~Environment() {
v8::HandleScope handle_scope(isolate());

#if HAVE_INSPECTOR
// Destroy inspector agent before erasing the context.
delete inspector_agent_;
// Destroy inspector agent before erasing the context. The inspector
// destructor depends on the context still being accessible.
inspector_agent_.reset(nullptr);
#endif

context()->SetAlignedPointerInEmbedderData(kContextEmbedderDataIndex,
Expand Down
4 changes: 2 additions & 2 deletions src/env.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -689,7 +689,7 @@ class Environment {

#if HAVE_INSPECTOR
inline inspector::Agent* inspector_agent() const {
return inspector_agent_;
return inspector_agent_.get();
}
#endif

Expand Down Expand Up @@ -734,7 +734,7 @@ class Environment {
std::map<std::string, uint64_t> performance_marks_;

#if HAVE_INSPECTOR
inspector::Agent* const inspector_agent_;
std::unique_ptr<inspector::Agent> inspector_agent_;
#endif

HandleWrapQueue handle_wrap_queue_;
Expand Down