module: inline try catch

Moving `try / catch` into separate functions is not necessary anymore due to V8 optimizations. PR-URL: #26970 Refs: #25362 Reviewed-By: Guy Bedford <guybedford@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Signed-off-by: Beth Griggs <Bethany.Griggs@uk.ibm.com>
nodejs · Apr 9, 2019 · 3263264 · 3263264
1 parent e9bffa8
commit 3263264
Show file tree

Hide file tree

Showing 16 changed files with 12 additions and 30 deletions.
diff --git a/lib/internal/modules/cjs/loader.js b/lib/internal/modules/cjs/loader.js
@@ -595,13 +595,7 @@ Module._load = function(request, parent, isMain) {
 
   Module._cache[filename] = module;
 
-  tryModuleLoad(module, filename);
-
-  return module.exports;
-};
-
-function tryModuleLoad(module, filename) {
-  var threw = true;
+  let threw = true;
   try {
     module.load(filename);
     threw = false;
@@ -610,7 +604,9 @@ function tryModuleLoad(module, filename) {
       delete Module._cache[filename];
     }
   }
-}
+
+  return module.exports;
+};
 
 Module._resolveFilename = function(request, parent, isMain, options) {
   if (NativeModule.canBeRequiredByUsers(request)) {

diff --git a/test/message/assert_throws_stack.out b/test/message/assert_throws_stack.out
@@ -16,4 +16,3 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly deep-equal:
     at *
     at *
     at *
-    at *
diff --git a/test/message/console.out b/test/message/console.out
@@ -7,4 +7,3 @@ Trace: foo
     at *
     at *
     at *
-    at *
diff --git a/test/message/core_line_numbers.out b/test/message/core_line_numbers.out
@@ -9,7 +9,6 @@ RangeError: Invalid input
     at Module._compile (internal/modules/cjs/loader.js:*:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
     at Module.load (internal/modules/cjs/loader.js:*:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*:*)
     at internal/main/run_main_module.js:*:*
diff --git a/test/message/error_exit.out b/test/message/error_exit.out
@@ -11,7 +11,6 @@ AssertionError [ERR_ASSERTION]: Expected values to be strictly equal:
     at Module._compile (internal/modules/cjs/loader.js:*:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
     at Module.load (internal/modules/cjs/loader.js:*:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*:*)
     at internal/main/run_main_module.js:*:*
diff --git a/test/message/events_unhandled_error_common_trace.out b/test/message/events_unhandled_error_common_trace.out
@@ -9,7 +9,6 @@ Error: foo:bar
     at Module._compile (internal/modules/cjs/loader.js:*:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
     at Module.load (internal/modules/cjs/loader.js:*:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*:*)
     at internal/main/run_main_module.js:*:*

diff --git a/test/message/events_unhandled_error_nexttick.out b/test/message/events_unhandled_error_nexttick.out
@@ -7,7 +7,6 @@ Error
     at Module._compile (internal/modules/cjs/loader.js:*:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
     at Module.load (internal/modules/cjs/loader.js:*:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*:*)
     at internal/main/run_main_module.js:*:*

diff --git a/test/message/events_unhandled_error_sameline.out b/test/message/events_unhandled_error_sameline.out
@@ -7,7 +7,6 @@ Error
     at Module._compile (internal/modules/cjs/loader.js:*:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
     at Module.load (internal/modules/cjs/loader.js:*:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*:*)
     at internal/main/run_main_module.js:*:*

diff --git a/test/message/if-error-has-good-stack.out b/test/message/if-error-has-good-stack.out
@@ -14,6 +14,6 @@ AssertionError [ERR_ASSERTION]: ifError got unwanted exception: test error
     at Module._compile (internal/modules/cjs/loader.js:*:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*:*)
     at Module.load (internal/modules/cjs/loader.js:*:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*:*)
+    at internal/main/run_main_module.js:*:*
diff --git a/test/message/undefined_reference_in_new_context.out b/test/message/undefined_reference_in_new_context.out
@@ -12,5 +12,5 @@ ReferenceError: foo is not defined
     at Module._compile (internal/modules/cjs/loader.js:*)
     at *..js (internal/modules/cjs/loader.js:*)
     at Module.load (internal/modules/cjs/loader.js:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*:*)
+    at Function.Module.runMain (internal/modules/cjs/loader.js:*:*)
diff --git a/test/message/unhandled_promise_trace_warnings.out b/test/message/unhandled_promise_trace_warnings.out
@@ -12,7 +12,6 @@
     at *
     at *
     at *
-    at *
 (node:*) Error: This was rejected
     at * (*test*message*unhandled_promise_trace_warnings.js:*)
     at *
@@ -21,7 +20,6 @@
     at *
     at *
     at *
-    at *
 (node:*) [DEP0018] DeprecationWarning: Unhandled promise rejections are deprecated. In the future, promise rejections that are not handled will terminate the Node.js process with a non-zero exit code.
     at *
     at *

diff --git a/test/message/util_inspect_error.out b/test/message/util_inspect_error.out
@@ -8,7 +8,6 @@
        at *
        at *
        at *
-       at *
   nested:
    { err:
       Error: foo
@@ -20,7 +19,6 @@
           at *
           at *
           at *
-          at *
 {
   err: Error: foo
   bar
@@ -31,7 +29,6 @@
       at *
       at *
       at *
-      at *
   nested: {
     err: Error: foo
     bar
@@ -42,7 +39,6 @@
         at *
         at *
         at *
-        at *
   }
 }
 { Error: foo
@@ -54,5 +50,4 @@ bar
     at *
     at *
     at *
-    at *
   foo: 'bar' }
diff --git a/test/message/vm_display_runtime_error.out b/test/message/vm_display_runtime_error.out
@@ -11,9 +11,9 @@ Error: boo!
     at Module._compile (internal/modules/cjs/loader.js:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*)
     at Module.load (internal/modules/cjs/loader.js:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*)
+    at internal/main/run_main_module.js:*:*
 test.vm:1
 throw new Error("spooky!")
 ^
@@ -26,6 +26,6 @@ Error: spooky!
     at Module._compile (internal/modules/cjs/loader.js:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*)
     at Module.load (internal/modules/cjs/loader.js:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*)
+    at internal/main/run_main_module.js:*:*
diff --git a/test/message/vm_display_syntax_error.out b/test/message/vm_display_syntax_error.out
@@ -10,9 +10,9 @@ SyntaxError: Unexpected number
     at Module._compile (internal/modules/cjs/loader.js:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*)
     at Module.load (internal/modules/cjs/loader.js:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*)
+    at internal/main/run_main_module.js:*:*
 test.vm:1
 var 5;
     ^
@@ -24,6 +24,6 @@ SyntaxError: Unexpected number
     at Module._compile (internal/modules/cjs/loader.js:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*)
     at Module.load (internal/modules/cjs/loader.js:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*)
+    at internal/main/run_main_module.js:*:*
diff --git a/test/message/vm_dont_display_runtime_error.out b/test/message/vm_dont_display_runtime_error.out
@@ -12,6 +12,6 @@ Error: boo!
     at Module._compile (internal/modules/cjs/loader.js:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*)
     at Module.load (internal/modules/cjs/loader.js:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*)
+    at internal/main/run_main_module.js:*:*
diff --git a/test/message/vm_dont_display_syntax_error.out b/test/message/vm_dont_display_syntax_error.out
@@ -12,6 +12,6 @@ SyntaxError: Unexpected number
     at Module._compile (internal/modules/cjs/loader.js:*)
     at Object.Module._extensions..js (internal/modules/cjs/loader.js:*)
     at Module.load (internal/modules/cjs/loader.js:*)
-    at tryModuleLoad (internal/modules/cjs/loader.js:*:*)
     at Function.Module._load (internal/modules/cjs/loader.js:*)
     at Function.Module.runMain (internal/modules/cjs/loader.js:*)
+    at internal/main/run_main_module.js:*:*