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

src/debug/debug-coverage.cc

 // Copyright 2017 the V8 project authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "src/debug/debug-coverage.h"
 
 #include "src/base/hashmap.h"
 #include "src/deoptimizer.h"
 #include "src/frames-inl.h"
 #include "src/isolate.h"
@@ skipping 141 matching lines @@
           case v8::debug::Coverage::kPreciseCount:
             break;
           case v8::debug::Coverage::kPreciseBinary:
             count = info->has_reported_binary_coverage() ? 0 : 1;
             info->set_has_reported_binary_coverage(true);
             break;
           case v8::debug::Coverage::kBestEffort:
             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;
       }
-      Handle<String> name(info->DebugName(), isolate);
-      nesting.push_back(functions->size());
-      functions->emplace_back(start, end, count, name);
+      // 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.
+      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();
   }
   return result;
 }
 
 void Coverage::SelectMode(Isolate* isolate, debug::Coverage::Mode mode) {
   switch (mode) {
@@ skipping 29 matching lines @@
       for (const auto& vector : vectors) list = ArrayList::Add(list, vector);
       isolate->SetCodeCoverageList(*list);
       break;
     }
   }
   isolate->set_code_coverage_mode(mode);
 }
 
 }  // namespace internal
 }  // namespace v8