Minor refactoring of C++ compilation.

--
MOS_MIGRATED_REVID=124815043

1 files changed, 4 insertions, 6 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
index 2569b4d9ea..33f894f3b0 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CppModel.java
@@ -559,8 +559,7 @@ public final class CppModel {
     if (fake) {
       boolean usePic = !generateNoPicAction;
       createFakeSourceAction(outputName, result, env, builder, outputExtension,
-          dependencyFileExtension, addObject, ccRelativeName, sourceArtifact.getExecPath(), usePic,
-          generateDwo);
+          dependencyFileExtension, addObject, ccRelativeName, sourceArtifact.getExecPath(), usePic);
     } else {
       // Create PIC compile actions (same as non-PIC, but use -fPIC and
       // generate .pic.o, .pic.d, .pic.gcno instead of .o, .d, .gcno.)
@@ -659,7 +658,7 @@ public final class CppModel {
   private void createFakeSourceAction(PathFragment outputName, CcCompilationOutputs.Builder result,
       AnalysisEnvironment env, CppCompileActionBuilder builder, String outputExtension,
       String dependencyFileExtension, boolean addObject, PathFragment ccRelativeName,
-      PathFragment execPath, boolean usePic, boolean generateDwo) {
+      PathFragment execPath, boolean usePic) {
     if (usePic) {
       outputExtension = ".pic" + outputExtension;
       dependencyFileExtension = ".pic" + dependencyFileExtension;
@@ -674,9 +673,8 @@ public final class CppModel {
         .setDotdFile(outputName, dependencyFileExtension)
         .setTempOutputFile(tempOutputName);
 
-    Artifact dwoFile = generateDwo ? getDwoFile(outputFile) : null;
-    builder.setDwoFile(dwoFile);
-    setupBuildVariables(builder, usePic, ccRelativeName, execPath, null, dwoFile);
+    setupBuildVariables(builder, usePic, ccRelativeName, execPath, /*gcnoFile*/ null,
+        /*dwoFile*/ null);
     semantics.finalizeCompileActionBuilder(ruleContext, builder);
     CppCompileAction action = builder.build();
     env.registerAction(action);