nodejs · joyeecheung · Sep 19, 2019 · Sep 19, 2019 · Sep 20, 2019 · joyeecheung
diff --git a/src/node_errors.cc b/src/node_errors.cc
@@ -978,6 +978,9 @@ void TriggerUncaughtException(Isolate* isolate,

  // Now we are certain that the exception is fatal.
  ReportFatalException(env, error, message, EnhanceFatalException::kEnhance);
+#if HAVE_INSPECTOR
+  profiler::EndStartedProfilers(env);
+#endif

  // If the global uncaught exception handler sets process.exitCode,
  // exit with that code. Otherwise, exit with 1.

diff --git a/test/fixtures/v8-coverage/throw.js b/test/fixtures/v8-coverage/throw.js
@@ -0,0 +1,7 @@
+const a = 99;
+if (true) {
+  const b = 101;
+} else {
+  const c = 102;
+}
+throw new Error('test');
diff --git a/test/parallel/test-v8-coverage.js b/test/parallel/test-v8-coverage.js
@@ -35,6 +35,24 @@ function nextdir() {
  assert.strictEqual(fixtureCoverage.functions[0].ranges[1].count, 0);
 }

+// Outputs coverage when error is thrown in first tick.
+{
+  const coverageDirectory = path.join(tmpdir.path, nextdir());
+  const output = spawnSync(process.execPath, [
+    require.resolve('../fixtures/v8-coverage/throw')
+  ], { env: { ...process.env, NODE_V8_COVERAGE: coverageDirectory } });
+  if (output.status !== 1) {
+    console.log(output.stderr.toString());
+  }
+  assert.strictEqual(output.status, 1);
+  const fixtureCoverage = getFixtureCoverage('throw.js', coverageDirectory);
+  assert.ok(fixtureCoverage, 'coverage not found for file');
+  // First branch executed.
+  assert.strictEqual(fixtureCoverage.functions[0].ranges[0].count, 1);
+  // Second branch did not execute.
+  assert.strictEqual(fixtureCoverage.functions[0].ranges[1].count, 0);
+}
+
 // Outputs coverage when process.exit(1) exits process.
 {
  const coverageDirectory = path.join(tmpdir.path, nextdir());
-Original file line number
+Diff line change
@@ -978,6 +978,9 @@ void TriggerUncaughtException(Isolate* isolate,
       // Now we are certain that the exception is fatal.
       ReportFatalException(env, error, message, EnhanceFatalException::kEnhance);
+    #if HAVE_INSPECTOR
+      profiler::EndStartedProfilers(env);
               Copy link

  
        
      
    

    
        

  
  Member


        

  Author


    
  

  
    
      
          
      

      
            joyeecheung
  

      

      

      


        Sep 19, 2019


      
    

  


        
      
  
  
  
    

    There was a problem hiding this comment.


  

 
  
    

    Choose a reason for hiding this comment

    
      The reason will be displayed to describe this comment to others. Learn more.
    

    
      
      


  


  
    
      Uh just realized we should call profiler::EndStartedProfilers instead since the whole WaitForInspectorDisconnect resets signals.
    
  
  



    

        
      
  
  
    
  
  
  
    
    Sorry, something went wrong.
  

  
    
  
    
      

              Uh oh!

              
There was an error while loading. Please reload this page.


  
  


          
              
  
    
    
      
        
            
    All reactions
+    #endif
       // If the global uncaught exception handler sets process.exitCode,
       // exit with that code. Otherwise, exit with 1.
-          Expand Down