Rename some variables for easier understanding of the code.

PiperOrigin-RevId: 164581142

2 files changed, 14 insertions, 16 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
index d396ec3808..019675e087 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcLibrary.java
@@ -86,9 +86,9 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory {
   public ConfiguredTarget create(RuleContext context)
       throws RuleErrorException, InterruptedException {
     RuleConfiguredTargetBuilder builder = new RuleConfiguredTargetBuilder(context);
-    LinkTargetType linkType = getStaticLinkType(context);
+    LinkTargetType staticLinkType = getStaticLinkType(context);
     boolean linkStatic = context.attributes().get("linkstatic", Type.BOOLEAN);
-    init(semantics, context, builder, linkType,
+    init(semantics, context, builder, staticLinkType,
         /*neverLink =*/ false,
         linkStatic,
         /*collectLinkstamp =*/ true,
@@ -100,7 +100,7 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory {
       CppSemantics semantics,
       RuleContext ruleContext,
       RuleConfiguredTargetBuilder targetBuilder,
-      LinkTargetType linkType,
+      LinkTargetType staticLinkType,
       boolean neverLink,
       boolean linkStatic,
       boolean collectLinkstamp,
@@ -132,7 +132,7 @@ public abstract class CcLibrary implements RuleConfiguredTargetFactory {
             // between Bazel and Blaze.
             .setGenerateLinkActionsIfEmpty(
                 ruleContext.getRule().getImplicitOutputsFunction() != ImplicitOutputsFunction.NONE)
-            .setLinkType(linkType)
+            .setLinkType(staticLinkType)
             .setNeverLink(neverLink)
             .addPrecompiledFiles(precompiledFiles);
 
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 7bd76742af..4ce49c74b4 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
@@ -1268,9 +1268,7 @@ public final class CppModel {
           SolibSymlinkAction.getDynamicLibrarySoname(soImpl.getRootRelativePath(), false));
     }
 
-    // Should we also link in any libraries that this library depends on?
-    // That is required on some systems...
-    CppLinkActionBuilder linkActionBuilder =
+    CppLinkActionBuilder dynamicLinkActionBuilder =
         newLinkActionBuilder(soImpl)
             .setInterfaceOutput(soInterface)
             .addObjectFiles(ccOutputs.getObjectFiles(usePicForSharedLibs))
@@ -1290,29 +1288,29 @@ public final class CppModel {
 
     if (!ccOutputs.getLtoBitcodeFiles().isEmpty()
         && featureConfiguration.isEnabled(CppRuleClasses.THIN_LTO)) {
-      linkActionBuilder.setLtoIndexing(true);
-      linkActionBuilder.setUsePicForLtoBackendActions(usePicForSharedLibs);
+      dynamicLinkActionBuilder.setLtoIndexing(true);
+      dynamicLinkActionBuilder.setUsePicForLtoBackendActions(usePicForSharedLibs);
       // If support is ever added for generating a dwp file for shared
       // library targets (e.g. when linkstatic=0), then this should change
       // to generate dwo files when cppConfiguration.useFission(),
       // and the dwp generating action for the shared library should
       // include all of the resulting dwo files.
-      linkActionBuilder.setUseFissionForLtoBackendActions(false);
-      CppLinkAction indexAction = linkActionBuilder.build();
+      dynamicLinkActionBuilder.setUseFissionForLtoBackendActions(false);
+      CppLinkAction indexAction = dynamicLinkActionBuilder.build();
       env.registerAction(indexAction);
 
-      linkActionBuilder.setLtoIndexing(false);
+      dynamicLinkActionBuilder.setLtoIndexing(false);
     }
 
-    CppLinkAction action = linkActionBuilder.build();
-    env.registerAction(action);
+    CppLinkAction dynamicLinkAction = dynamicLinkActionBuilder.build();
+    env.registerAction(dynamicLinkAction);
 
     if (linkType == LinkTargetType.EXECUTABLE) {
       return result.build();
     }
 
-    LibraryToLink dynamicLibrary = action.getOutputLibrary();
-    LibraryToLink interfaceLibrary = action.getInterfaceOutputLibrary();
+    LibraryToLink dynamicLibrary = dynamicLinkAction.getOutputLibrary();
+    LibraryToLink interfaceLibrary = dynamicLinkAction.getInterfaceOutputLibrary();
     if (interfaceLibrary == null) {
       interfaceLibrary = dynamicLibrary;
     }