Do location expansion in copts of objc_library

Roll forward with placing every TransitiveInfoCollection in a set so that duplicate entries are removed. Test has been modified to exercise the duplicate case. Fixes bazelbuild#13862 RELNOTES:none PiperOrigin-RevId: 410209862
fweikert · Nov 16, 2021 · fd727ec · fd727ec
1 parent e5b3536
commit fd727ec
Show file tree

Hide file tree

Showing 3 changed files with 38 additions and 2 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java b/src/main/java/com/google/devtools/build/lib/analysis/starlark/StarlarkRuleContext.java
@@ -1103,7 +1103,7 @@ private static void checkDeprecated(String newApi, String oldApi, StarlarkSemant
    * @param knownLabels List of known labels
    * @return Immutable map with immutable collections as values
    */
-  private static ImmutableMap<Label, ImmutableCollection<Artifact>> makeLabelMap(
+  public static ImmutableMap<Label, ImmutableCollection<Artifact>> makeLabelMap(
       Iterable<TransitiveInfoCollection> knownLabels) {
     ImmutableMap.Builder<Label, ImmutableCollection<Artifact>> builder = ImmutableMap.builder();
 

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkInternal.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ObjcStarlarkInternal.java
@@ -18,8 +18,11 @@
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Iterables;
 import com.google.devtools.build.docgen.annot.DocCategory;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.analysis.LocationExpander;
 import com.google.devtools.build.lib.analysis.TemplateVariableInfo;
 import com.google.devtools.build.lib.analysis.starlark.StarlarkRuleContext;
 import com.google.devtools.build.lib.analysis.test.InstrumentedFilesInfo;
@@ -116,7 +119,19 @@ public Sequence<String> expandToolchainAndRuleContextVariables(
         ImmutableMap.<String, String>builder().putAll(starlarkRuleContext.var()).build();
     List<String> expandedFlags = new ArrayList<>();
     for (String flag : Sequence.cast(flags, String.class, "flags")) {
-      String expandedFlag = expandFlag(flag, toolchainMap, starlarkRuleContextMap);
+
+      String expandedFlag =
+          LocationExpander.withExecPaths(
+                  starlarkRuleContext.getRuleContext(),
+                  StarlarkRuleContext.makeLabelMap(
+                      ImmutableSet.copyOf(
+                          Iterables.concat(
+                              starlarkRuleContext.getRuleContext().getPrerequisites("srcs"),
+                              starlarkRuleContext.getRuleContext().getPrerequisites("non_arc_srcs"),
+                              starlarkRuleContext.getRuleContext().getPrerequisites("hdrs"),
+                              starlarkRuleContext.getRuleContext().getPrerequisites("data")))))
+              .expand(flag);
+      expandedFlag = expandFlag(expandedFlag, toolchainMap, starlarkRuleContextMap);
       try {
         ShellUtils.tokenize(expandedFlags, expandedFlag);
       } catch (TokenizationException e) {

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcLibraryTest.java
@@ -2380,4 +2380,25 @@ public void testCompilationPrerequisitesHasHeaders() throws Exception {
                     .getOutputGroup(OutputGroupInfo.COMPILATION_PREREQUISITES)))
         .contains("src bin/cc.h");
   }
+
+  @Test
+  public void testCoptsLocationIsExpanded() throws Exception {
+    scratch.file(
+        "bin/BUILD",
+        "objc_library(",
+        "    name = 'lib',",
+        "    copts = ['$(rootpath lib1.m) $(location lib2.m) $(location data.data) $(execpath"
+            + " header.h)'],",
+        "    srcs = ['lib1.m'],",
+        "    non_arc_srcs = ['lib2.m'],",
+        "    data = ['data.data', 'lib2.m'],",
+        "    hdrs = ['header.h'],",
+        ")");
+
+    useConfiguration("--apple_platform_type=ios", "--cpu=ios_x86_64");
+
+    CppCompileAction compileA = (CppCompileAction) compileAction("//bin:lib", "lib1.o");
+    assertThat(compileA.compileCommandLine.getCopts())
+        .containsAtLeast("bin/lib1.m", "bin/lib2.m", "bin/data.data", "bin/header.h");
+  }
 }