src: removes fatal_error check from per-isolate + adds tests

Author: Shobhit Chittora

src/node_options.cc

@@ -70,6 +70,15 @@ void PerProcessOptions::CheckOptions(std::vector<std::string>* errors) {
       use_largepages != "silent") {
     errors->push_back("invalid value for --use-largepages");
   }
+
+// #ifdef NODE_REPORT
+//   if (report_on_fatalerror) {
+//     errors->push_back(
+//         "--report-on-fatalerror option is valid only when "
+//         "--experimental-report is set");
+//   }
+// #endif  // NODE_REPORT
+
   per_isolate->CheckOptions(errors);
 }
 
@@ -100,12 +109,6 @@ void PerIsolateOptions::CheckOptions(std::vector<std::string>* errors) {
                       "--experimental-report is set");
   }
 
-  if (report_on_fatalerror) {
-    errors->push_back(
-        "--report-on-fatalerror option is valid only when "
-        "--experimental-report is set");
-  }
-
   if (report_on_signal) {
     errors->push_back("--report-on-signal option is valid only when "
                       "--experimental-report is set");
@@ -622,10 +625,6 @@ PerIsolateOptionsParser::PerIsolateOptionsParser(
             "generate diagnostic report upon receiving signals",
             &PerIsolateOptions::report_on_signal,
             kAllowedInEnvironment);
-  AddOption("--report-on-fatalerror",
-            "generate diagnostic report on fatal (internal) errors",
-            &PerIsolateOptions::report_on_fatalerror,
-            kAllowedInEnvironment);
   AddOption("--report-signal",
             "causes diagnostic report to be produced on provided signal,"
             " unsupported in Windows. (default: SIGUSR2)",
@@ -699,12 +698,10 @@ PerProcessOptionsParser::PerProcessOptionsParser(
             &PerProcessOptions::print_v8_help);
 
 #ifdef NODE_REPORT
-
 AddOption("--report-on-fatalerror",
             "generate diagnostic report on fatal (internal) errors",
             &PerProcessOptions::report_on_fatalerror,
-            kAllowedInEnvironment);
-            
+            kAllowedInEnvironment);            
 #endif  // NODE_REPORT
 
 #ifdef NODE_HAVE_I18N_SUPPORT

src/node_options.h

@@ -190,7 +190,6 @@ class PerIsolateOptions : public Options {
 #ifdef NODE_REPORT
   bool report_uncaught_exception = false;
   bool report_on_signal = false;
-  bool report_on_fatalerror = false;
   std::string report_signal;
   std::string report_filename;
   std::string report_directory;

src/node_report_module.cc

@@ -119,13 +119,13 @@ static void SetSignal(const FunctionCallbackInfo<Value>& info) {
 static void ShouldReportOnFatalError(const FunctionCallbackInfo<Value>& info) {
   Environment* env = Environment::GetCurrent(info);
   info.GetReturnValue().Set(
-      env->isolate_data()->options()->report_on_fatalerror);
+    node::per_process::cli_options->report_on_fatalerror);
 }
 
 static void SetReportOnFatalError(const FunctionCallbackInfo<Value>& info) {
   Environment* env = Environment::GetCurrent(info);
   CHECK(info[0]->IsBoolean());
-  env->isolate_data()->options()->report_on_fatalerror = info[0]->IsTrue();
+  node::per_process::cli_options->report_on_fatalerror = info[0]->IsTrue();
 }
 
 static void ShouldReportOnSignal(const FunctionCallbackInfo<Value>& info) {

test/report/test-report-fatal-error.js

@@ -21,18 +21,27 @@ if (process.argv[2] === 'child') {
   const helper = require('../common/report.js');
   const tmpdir = require('../common/tmpdir');
   tmpdir.refresh();
-  const spawn = require('child_process').spawn;
-  const args = ['--experimental-report',
-                '--report-on-fatalerror',
-                '--max-old-space-size=20',
-                __filename,
-                'child'];
-  const child = spawn(process.execPath, args, { cwd: tmpdir.path });
-  child.on('exit', common.mustCall((code) => {
-    assert.notStrictEqual(code, 0, 'Process exited unexpectedly');
-    const reports = helper.findReports(child.pid, tmpdir.path);
-    assert.strictEqual(reports.length, 1);
-    const report = reports[0];
-    helper.validate(report);
-  }));
+  const spawnSync = require('child_process').spawnSync;
+  let args = ['--experimental-report',
+              '--report-on-fatalerror',
+              '--max-old-space-size=20',
+              __filename,
+              'child'];
+
+  let child = spawnSync(process.execPath, args, { cwd: tmpdir.path });
+
+  assert.notStrictEqual(child.status, 0, 'Process exited unexpectedly');
+  let reports = helper.findReports(child.pid, tmpdir.path);
+  assert.strictEqual(reports.length, 1);
+  const report = reports[0];
+  helper.validate(report);
+
+  args = ['--max-old-space-size=20',
+          __filename,
+          'child'];
+
+  child = spawnSync(process.execPath, args, { cwd: tmpdir.path });
+  assert.notStrictEqual(child.status, 0, 'Process exited unexpectedly');
+  reports = helper.findReports(child.pid, tmpdir.path);
+  assert.strictEqual(reports.length, 0);
 }