[debug] fix coverage for non-default test variants.

R=jgruber@chromium.org
BUG=v8:6165

Review-Url: https://codereview.chromium.org/2794443002
Cr-Commit-Position: refs/heads/master@{#44329}

src/debug/debug-coverage.cc

@@ -159,15 +159,16 @@ Coverage* Coverage::Collect(Isolate* isolate,
             count = 1;
             break;
         }
-      } else if (nesting.empty() || functions->at(nesting.back()).count == 0) {
+      }
       // Only include a function range if it has a non-0 count, or
       // if it is directly nested inside a function with non-0 count.
-        continue;
-      }
+      if (count != 0 ||
+          (!nesting.empty() && functions->at(nesting.back()).count != 0)) {
         Handle<String> name(info->DebugName(), isolate);
         nesting.push_back(functions->size());
         functions->emplace_back(start, end, count, name);
       }
+    }
 
     // Remove entries for scripts that have no coverage.
     if (functions->empty()) result->pop_back();

test/inspector/cpu-profiler/coverage.js

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-// Flags: --allow-natives-syntax
+// Flags: --allow-natives-syntax --no-always-opt --crankshaft
 
 var source =
 `

test/inspector/inspector.status

@@ -6,8 +6,6 @@
 
 ##############################################################################
 ['variant != default', {
-  # Issue 6165.
-  'cpu-profiler/coverage': [PASS, FAIL],
   # Issue 6166.
   'debugger/asm-js-breakpoint-during-exec': [PASS, FAIL],
   'debugger/asm-js-stack': [PASS, FAIL],