src: move ShouldNotAbortOnUncaughtScope out of Environment

joyeecheung · joyeecheung · commit 9d854fb60cd4 · 2019-03-27T10:30:19.000-04:00
PR-URL: nodejs#26824 Refs: nodejs#26776 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: James M Snell <jasnell@gmail.com>
diff --git a/src/env-inl.h b/src/env-inl.h
@@ -487,24 +487,32 @@ inline uint32_t Environment::get_next_function_id() {
   return function_id_counter_++;
 }
 
-Environment::ShouldNotAbortOnUncaughtScope::ShouldNotAbortOnUncaughtScope(
+ShouldNotAbortOnUncaughtScope::ShouldNotAbortOnUncaughtScope(
     Environment* env)
     : env_(env) {
-  env_->should_not_abort_scope_counter_++;
+  env_->PushShouldNotAbortOnUncaughtScope();
 }
 
-Environment::ShouldNotAbortOnUncaughtScope::~ShouldNotAbortOnUncaughtScope() {
+ShouldNotAbortOnUncaughtScope::~ShouldNotAbortOnUncaughtScope() {
   Close();
 }
 
-void Environment::ShouldNotAbortOnUncaughtScope::Close() {
+void ShouldNotAbortOnUncaughtScope::Close() {
   if (env_ != nullptr) {
-    env_->should_not_abort_scope_counter_--;
+    env_->PopShouldNotAbortOnUncaughtScope();
     env_ = nullptr;
   }
 }
 
-bool Environment::inside_should_not_abort_on_uncaught_scope() const {
+inline void Environment::PushShouldNotAbortOnUncaughtScope() {
+  should_not_abort_scope_counter_++;
+}
+
+inline void Environment::PopShouldNotAbortOnUncaughtScope() {
+  should_not_abort_scope_counter_--;
+}
+
+inline bool Environment::inside_should_not_abort_on_uncaught_scope() const {
   return should_not_abort_scope_counter_ > 0;
 }
 
diff --git a/src/env.h b/src/env.h
@@ -684,6 +684,16 @@ class TrackingTraceStateObserver :
   Environment* env_;
 };
 
+class ShouldNotAbortOnUncaughtScope {
+ public:
+  explicit inline ShouldNotAbortOnUncaughtScope(Environment* env);
+  inline void Close();
+  inline ~ShouldNotAbortOnUncaughtScope();
+
+ private:
+  Environment* env_;
+};
+
 class Environment {
  public:
   Environment(const Environment&) = delete;
@@ -998,16 +1008,8 @@ class Environment {
   // This needs to be available for the JS-land setImmediate().
   void ToggleImmediateRef(bool ref);
 
-  class ShouldNotAbortOnUncaughtScope {
-   public:
-    explicit inline ShouldNotAbortOnUncaughtScope(Environment* env);
-    inline void Close();
-    inline ~ShouldNotAbortOnUncaughtScope();
-
-   private:
-    Environment* env_;
-  };
-
+  inline void PushShouldNotAbortOnUncaughtScope();
+  inline void PopShouldNotAbortOnUncaughtScope();
   inline bool inside_should_not_abort_on_uncaught_scope() const;
 
   static inline Environment* ForAsyncHooks(AsyncHooks* hooks);
diff --git a/src/module_wrap.cc b/src/module_wrap.cc
@@ -136,7 +136,7 @@ void ModuleWrap::New(const FunctionCallbackInfo<Value>& args) {
     column_offset = Integer::New(isolate, 0);
   }
 
-  Environment::ShouldNotAbortOnUncaughtScope no_abort_scope(env);
+  ShouldNotAbortOnUncaughtScope no_abort_scope(env);
   TryCatchScope try_catch(env);
   Local<Module> module;
 
@@ -280,7 +280,7 @@ void ModuleWrap::Evaluate(const FunctionCallbackInfo<Value>& args) {
   CHECK(args[1]->IsBoolean());
   bool break_on_sigint = args[1]->IsTrue();
 
-  Environment::ShouldNotAbortOnUncaughtScope no_abort_scope(env);
+  ShouldNotAbortOnUncaughtScope no_abort_scope(env);
   TryCatchScope try_catch(env);
 
   bool timed_out = false;
diff --git a/src/node_contextify.cc b/src/node_contextify.cc
@@ -719,7 +719,7 @@ void ContextifyScript::New(const FunctionCallbackInfo<Value>& args) {
     compile_options = ScriptCompiler::kConsumeCodeCache;
 
   TryCatchScope try_catch(env);
-  Environment::ShouldNotAbortOnUncaughtScope no_abort_scope(env);
+  ShouldNotAbortOnUncaughtScope no_abort_scope(env);
   Context::Scope scope(parsing_context);
 
   MaybeLocal<UnboundScript> v8_script = ScriptCompiler::CompileUnboundScript(

Original file line number	Diff line number	Diff line change
`@@ -487,24 +487,32 @@ inline uint32_t Environment::get_next_function_id() {`
`487`	`487`	`return function_id_counter_++;`
`488`	`488`	`}`
`489`	`489`
`490`		`-Environment::ShouldNotAbortOnUncaughtScope::ShouldNotAbortOnUncaughtScope(`
	`490`	`+ShouldNotAbortOnUncaughtScope::ShouldNotAbortOnUncaughtScope(`
`491`	`491`	`Environment* env)`
`492`	`492`	`: env_(env) {`
`493`		`- env_->should_not_abort_scope_counter_++;`
	`493`	`+ env_->PushShouldNotAbortOnUncaughtScope();`
`494`	`494`	`}`
`495`	`495`
`496`		`-Environment::ShouldNotAbortOnUncaughtScope::~ShouldNotAbortOnUncaughtScope() {`
	`496`	`+ShouldNotAbortOnUncaughtScope::~ShouldNotAbortOnUncaughtScope() {`
`497`	`497`	`Close();`
`498`	`498`	`}`
`499`	`499`
`500`		`-void Environment::ShouldNotAbortOnUncaughtScope::Close() {`
	`500`	`+void ShouldNotAbortOnUncaughtScope::Close() {`
`501`	`501`	`if (env_ != nullptr) {`
`502`		`- env_->should_not_abort_scope_counter_--;`
	`502`	`+ env_->PopShouldNotAbortOnUncaughtScope();`
`503`	`503`	`env_ = nullptr;`
`504`	`504`	`}`
`505`	`505`	`}`
`506`	`506`
`507`		`-bool Environment::inside_should_not_abort_on_uncaught_scope() const {`
	`507`	`+inline void Environment::PushShouldNotAbortOnUncaughtScope() {`
	`508`	`+ should_not_abort_scope_counter_++;`
	`509`	`+}`
	`510`	`+`
	`511`	`+inline void Environment::PopShouldNotAbortOnUncaughtScope() {`
	`512`	`+ should_not_abort_scope_counter_--;`
	`513`	`+}`
	`514`	`+`
	`515`	`+inline bool Environment::inside_should_not_abort_on_uncaught_scope() const {`
`508`	`516`	`return should_not_abort_scope_counter_ > 0;`
`509`	`517`	`}`
`510`	`518`