nodejs
diff --git a/Collapse file
‎src/node.cc‎
Copy file name to clipboardExpand all lines: src/node.cc
+5-1Lines changed: 5 additions & 1 deletion b/Collapse file
‎src/node.cc‎
Copy file name to clipboardExpand all lines: src/node.cc
+5-1Lines changed: 5 additions & 1 deletion
diff --git a/Collapse file
‎test/abort/test-abort-uncaught-exception.js‎
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions b/Collapse file
‎test/abort/test-abort-uncaught-exception.js‎
Copy file name to clipboard
+31Lines changed: 31 additions & 0 deletions
@@ -2192,7 +2192,11 @@ void FatalException(Isolate* isolate,
 
   if (false == caught->BooleanValue()) {
     ReportException(env, error, message);
-    exit(1);
+    if (abort_on_uncaught_exception) {
+      ABORT();
+    } else {
+      exit(1);
+    }
   }
 }
 
 
@@ -0,0 +1,31 @@
+'use strict';
+
+const common = require('../common');
+const assert = require('assert');
+const spawn = require('child_process').spawn;
+const node = process.execPath;
+
+if (process.argv[2] === 'child') {
+  throw new Error('child error');
+} else {
+  run('', null);
+  run('--abort-on-uncaught-exception', 'SIGABRT');
+}
+
+function run(flags, signal) {
+  const args = [__filename, 'child'];
+  if (flags)
+    args.unshift(flags);
+
+  const child = spawn(node, args);
+  child.on('exit', common.mustCall(function(code, sig) {
+    if (!common.isWindows) {
+      assert.strictEqual(sig, signal);
+    } else {
+      if (signal)
+        assert.strictEqual(code, 3);
+      else
+        assert.strictEqual(code, 1);
+    }
+  }));
+}
Original file line number	Diff line number	Diff line change
`@@ -2192,7 +2192,11 @@ void FatalException(Isolate* isolate,`
`2192`	`2192`
`2193`	`2193`	`if (false == caught->BooleanValue()) {`
`2194`	`2194`	`ReportException(env, error, message);`
`2195`		`- exit(1);`
	`2195`	`+ if (abort_on_uncaught_exception) {`
	`2196`	`+ ABORT();`
	`2197`	`+ } else {`
	`2198`	`+ exit(1);`
	`2199`	`+ }`
`2196`	`2200`	`}`
`2197`	`2201`	`}`
`2198`	`2202`