Set gcov_gcno_file for Blaze

bazelbuild · Apr 29, 2024 · c97ef77 · c97ef77
1 parent 595deef
commit c97ef77
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcCompilationHelper.java
@@ -1151,6 +1151,7 @@ private Artifact createCompileActionTemplate(
             usePic,
             /* needsFdoBuildVariables= */ false,
             ccCompilationContext.getCppModuleMap(),
+            /* isCodeCoverageEnabled= */ false,
             /* gcnoFile= */ null,
             /* isUsingFission= */ false,
             /* dwoFile= */ null,
@@ -1262,6 +1263,7 @@ private CcToolchainVariables setupCompileBuildVariables(
       boolean usePic,
       boolean needsFdoBuildVariables,
       CppModuleMap cppModuleMap,
+      boolean isCodeCoverageEnabled,
       Artifact gcnoFile,
       boolean isUsingFission,
       Artifact dwoFile,
@@ -1352,6 +1354,7 @@ private CcToolchainVariables setupCompileBuildVariables(
         buildVariables,
         toPathString(sourceFile),
         toPathString(builder.getOutputFile()),
+        isCodeCoverageEnabled,
         toPathString(gcnoFile),
         toPathString(dwoFile),
         isUsingFission,
@@ -1431,6 +1434,7 @@ private void createModuleCodegenAction(
             /* usePic= */ pic,
             /* needsFdoBuildVariables= */ ccRelativeName != null,
             ccCompilationContext.getCppModuleMap(),
+            isCodeCoverageEnabled,
             gcnoFile,
             generateDwo,
             dwoFile,
@@ -1477,6 +1481,7 @@ private void createHeaderAction(
             generatePicAction,
             /* needsFdoBuildVariables= */ false,
             ccCompilationContext.getCppModuleMap(),
+            /* isCodeCoverageEnabled= */ false,
             /* gcnoFile= */ null,
             /* isUsingFission= */ false,
             /* dwoFile= */ null,
@@ -1557,6 +1562,7 @@ private ImmutableList<Artifact> createSourceAction(
               /* usePic= */ true,
               /* needsFdoBuildVariables= */ ccRelativeName != null && addObject,
               cppModuleMap,
+              isCodeCoverageEnabled,
               gcnoFile,
               generateDwo,
               dwoFile,
@@ -1630,6 +1636,7 @@ private ImmutableList<Artifact> createSourceAction(
               /* usePic= */ false,
               /* needsFdoBuildVariables= */ ccRelativeName != null,
               cppModuleMap,
+              isCodeCoverageEnabled,
               gcnoFile,
               generateDwo,
               noPicDwoFile,
@@ -1796,6 +1803,7 @@ private ImmutableList<Artifact> createTempsActions(
             usePic,
             /* needsFdoBuildVariables= */ ccRelativeName != null,
             ccCompilationContext.getCppModuleMap(),
+            /* isCodeCoverageEnabled= */ false,
             /* gcnoFile= */ null,
             /* isUsingFission= */ false,
             /* dwoFile= */ null,
@@ -1821,6 +1829,7 @@ private ImmutableList<Artifact> createTempsActions(
             usePic,
             /* needsFdoBuildVariables= */ ccRelativeName != null,
             ccCompilationContext.getCppModuleMap(),
+            /* isCodeCoverageEnabled= */ false,
             /* gcnoFile= */ null,
             /* isUsingFission= */ false,
             /* dwoFile= */ null,

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariables.java
@@ -334,6 +334,7 @@ public static void setupSpecificVariables(
       CcToolchainVariables.Builder buildVariables,
       String sourceFile,
       String outputFile,
+      boolean isCodeCoverageEnabled,
       String gcnoFile,
       String dwoFile,
       boolean isUsingFission,
@@ -371,6 +372,10 @@ public static void setupSpecificVariables(
 
     if (gcnoFile != null) {
       buildVariables.addStringVariable(GCOV_GCNO_FILE.getVariableName(), gcnoFile);
+    } else if (isCodeCoverageEnabled) {
+      // TODO: Blaze currently uses `gcov_gcno_file` to detect if code coverage is enabled. It
+      // should use a different signal.
+      buildVariables.addStringVariable(GCOV_GCNO_FILE.getVariableName(), "");
     }
 
     if (dwoFile != null) {