Disable indexing with build flags for targets without swift

Summary: Restricts indexing via build flags to targets containing Swift source code for `buck project`

fbshipit-source-id: c7c707f9b1150137f21009aad90959546a296933

Author: kcsiegal

src/com/facebook/buck/features/apple/projectV2/FlagParser.java

@@ -100,7 +100,7 @@ class FlagParser {
   private final AppleDependenciesCache dependenciesCache;
   private final SourcePathResolverAdapter defaultPathResolver;
   private final HeaderSearchPaths headerSearchPaths;
-  private final boolean indexViaBuildFlags;
+  private final boolean indexViaCompileArgs;
   private final ImmutableMap<Flavor, CxxBuckConfig> platformCxxBuckConfigs;
 
   FlagParser(
@@ -130,9 +130,7 @@ class FlagParser {
     this.dependenciesCache = dependenciesCache;
     this.defaultPathResolver = defaultPathResolver;
     this.headerSearchPaths = headerSearchPaths;
-    this.indexViaBuildFlags =
-        appleConfig.getProjectGeneratorIndexViaBuildFlags()
-            || appleConfig.getProjectGeneratorIndexViaCompileArgs();
+    this.indexViaCompileArgs = appleConfig.getProjectGeneratorIndexViaCompileArgs();
     this.platformCxxBuckConfigs = cxxBuckConfig.getFlavoredConfigs();
   }
 
@@ -182,7 +180,9 @@ void parseFlags(
             .orElse(ImmutableList.of()));
 
     ImmutableList.Builder<String> cFlagsBuilder = ImmutableList.builder();
-    if (indexViaBuildFlags) {
+    if (com.facebook.buck.features.apple.projectV2.Utils.getShouldIndexViaBuildFlagsForTargetNode(
+            targetNode, appleConfig)
+        || indexViaCompileArgs) {
       // We use argfiles to prevent increasing the already large xcconfig files in size
       try {
         cFlagsBuilder.add(

src/com/facebook/buck/features/apple/projectV2/HeaderSearchPaths.java

@@ -116,12 +116,11 @@ class HeaderSearchPaths {
   private final ProjectSourcePathResolver projectSourcePathResolver;
   private final PathRelativizer pathRelativizer;
   private final SwiftAttributeParser swiftAttributeParser;
-  private final ImmutableSet<String> swiftLabels;
-  private final boolean indexViaBuildFlags;
   private final ProjectFilesystem projectFilesystem;
   private final BuildContext buildContext;
   private final UnresolvedCxxPlatform unresolvedCxxPlatform;
   private final boolean indexViaCompileArgs;
+  private final AppleConfig appleConfig;
 
   private static final LoadingCache<ActionGraphBuilder, Map<UnflavoredBuildTarget, Set<BuildRule>>>
       mappingCache =
@@ -160,10 +159,9 @@ class HeaderSearchPaths {
     this.projectSourcePathResolver = projectSourcePathResolver;
     this.pathRelativizer = pathRelativizer;
     this.swiftAttributeParser = swiftAttributeParser;
-    this.swiftLabels = ImmutableSet.copyOf(appleConfig.getProjectGeneratorSwiftLabels());
-    this.indexViaBuildFlags = appleConfig.getProjectGeneratorIndexViaBuildFlags();
     this.indexViaCompileArgs = appleConfig.getProjectGeneratorIndexViaCompileArgs();
     this.projectFilesystem = projectCell.getFilesystem();
+    this.appleConfig = appleConfig;
   }
 
   /** Derives header search path attributes for the {@code targetNode}. */
@@ -207,7 +205,7 @@ HeaderSearchPathAttributes getHeaderSearchPathAttributes(
       ImmutableSet<Path> swiftIncludePaths = collectRecursiveSwiftIncludePaths(targetNode);
       builder.setSwiftIncludePaths(swiftIncludePaths);
 
-      if (indexViaBuildFlags) {
+      if (Utils.getShouldIndexViaBuildFlagsForTargetNode(targetNode, appleConfig)) {
         getIncludeFlags(targetNode, builder);
       }
     }
@@ -522,7 +520,7 @@ private void addPrivateHeaderIncludes(
     requiredBuildTargets.add(buildTarget);
 
     // If the module is mixed then we need to import the VFS overlay and the -Swift.h header hmap
-    if (targetNodeContainsSwift(targetNode)
+    if (Utils.targetNodeContainsSwift(targetNode, appleConfig)
         && !targetNode.getConstructorArg().getExportedHeaders().isEmpty()) {
       BuildTarget privateSwiftHeaderMapTarget =
           targetNode
@@ -584,7 +582,7 @@ private void addPublicHeaderIncludes(
     includeFlags.add("-I" + targetFilesystem.resolve(includePath));
     requiredBuildTargets.add(buildTarget);
 
-    if (targetNodeContainsSwift(targetNode)) {
+    if (Utils.targetNodeContainsSwift(targetNode, appleConfig)) {
       // Swift libraries also need to include their dependent libraries swiftmodule files
       BuildTarget swiftCompileTarget =
           targetNode
@@ -872,7 +870,7 @@ private ImmutableSortedMap<Path, SourcePath> getPrivateCxxHeaders(
                 SourceSortedSet.ofNamedSources(ImmutableSortedMap.of())));
       }
 
-      if (targetNodeContainsSwift(targetNode)) {
+      if (Utils.targetNodeContainsSwift(targetNode, appleConfig)) {
         // Mixed libraries need to see their -Swift.h header. This is exposed through the module,
         // but is also expected to be available in unprefixed form internally.
         String moduleName =
@@ -1118,7 +1116,7 @@ private ImmutableSet<Path> collectRecursiveHeaderSearchPaths(
     // but to do it right, it's likely that we'll need to add that. When that happens, we can also
     // update this "if" statement. If, long-term, we move towards using modules for all Objective-C
     // code, the merged header map will no longer work at all.
-    if (targetNodeContainsSwift(targetNode)) {
+    if (Utils.targetNodeContainsSwift(targetNode, appleConfig)) {
       Flavor defaultPlatformFlavor =
           targetNode.getConstructorArg().getDefaultPlatform().orElse(cxxPlatform.getFlavor());
 
@@ -1180,7 +1178,7 @@ private ImmutableSet<Path> collectRecursiveSwiftIncludePaths(
           // we do need to add the paths to .swiftmodule files for dependencies.
           if (nativeNode != targetNode
               && headerVisibility.equals(HeaderVisibility.PUBLIC)
-              && targetNodeContainsSwift(nativeNode)) {
+              && Utils.targetNodeContainsSwift(nativeNode, appleConfig)) {
             BuildTarget flavoredSwiftCompileTarget =
                 NodeHelper.getSwiftModuleTarget(nativeNode, defaultPlatformFlavor);
 
@@ -1193,19 +1191,6 @@ && targetNodeContainsSwift(nativeNode)) {
     return builder.build();
   }
 
-  private boolean targetNodeContainsSwift(
-      TargetNode<? extends CxxLibraryDescription.CommonArg> targetNode) {
-    // Codegen libraries will have empty srcs so we cannot only rely on target inputs.
-    // We first check for any of the labels specified in apple.project_generator_swift_labels
-    // to know if this target is specified as Swift in the build rules.
-    for (String label : targetNode.getConstructorArg().getLabels()) {
-      if (swiftLabels.contains(label)) {
-        return true;
-      }
-    }
-    return AppleDescriptions.targetNodeContainsSwiftSourceCode(targetNode);
-  }
-
   /** Adds the set of headers defined by headerVisibility to the merged header maps. */
   private void addToMergedHeaderMap(
       TargetNode<? extends CxxLibraryDescription.CommonArg> targetNode,

src/com/facebook/buck/features/apple/projectV2/Utils.java

@@ -16,6 +16,8 @@
 
 package com.facebook.buck.features.apple.projectV2;
 
+import com.facebook.buck.apple.AppleConfig;
+import com.facebook.buck.apple.AppleDescriptions;
 import com.facebook.buck.core.exceptions.HumanReadableException;
 import com.facebook.buck.core.filesystems.AbsPath;
 import com.facebook.buck.core.model.BuildTarget;
@@ -109,4 +111,38 @@ public static void addRequiredBuildTargetFromSourcePath(
       requiredBuildTargetsBuilder.add(buildTarget);
     }
   }
+
+  /**
+   * Checks whether the given target node contains Swift source code, including in generated files.
+   *
+   * @param targetNode The target node to check for Swift code.
+   * @param appleConfig The Apple config for the project.
+   */
+  public static boolean targetNodeContainsSwift(
+      TargetNode<? extends CxxLibraryDescription.CommonArg> targetNode, AppleConfig appleConfig) {
+    // Codegen libraries will have empty srcs so we cannot only rely on target inputs.
+    // We first check for any of the labels specified in apple.project_generator_swift_labels
+    // to know if this target is specified as Swift in the build rules.
+    ImmutableSet<String> swiftLabels =
+        ImmutableSet.copyOf(appleConfig.getProjectGeneratorSwiftLabels());
+    for (String label : targetNode.getConstructorArg().getLabels()) {
+      if (swiftLabels.contains(label)) {
+        return true;
+      }
+    }
+    return AppleDescriptions.targetNodeContainsSwiftSourceCode(targetNode);
+  }
+
+  /**
+   * Determines whether indexing via build flags should be enabled for the given target node.
+   *
+   * @param targetNode The target node for the indexing via build flags check.
+   * @param appleConfig The Apple config for the project.
+   */
+  public static boolean getShouldIndexViaBuildFlagsForTargetNode(
+      TargetNode<? extends CxxLibraryDescription.CommonArg> targetNode, AppleConfig appleConfig) {
+    // Only enable indexing with build flags if the target contains Swift
+    return appleConfig.getProjectGeneratorIndexViaBuildFlags()
+        && Utils.targetNodeContainsSwift(targetNode, appleConfig);
+  }
 }

src/com/facebook/buck/features/apple/projectV2/XcodeNativeTargetGenerator.java

@@ -1488,7 +1488,7 @@ && shouldEmbedSwiftRuntimeInBundleTarget(bundle)
     // Don't use Xcode's PCH generation when indexing with build flags. We will already have the
     // correct include in the indexing flags.
     if (prefixHeaderOptional.isPresent()
-        && !appleConfig.getProjectGeneratorIndexViaBuildFlags()
+        && !Utils.getShouldIndexViaBuildFlagsForTargetNode(targetNode, appleConfig)
         && !appleConfig.getProjectGeneratorIndexViaCompileArgs()) {
       RelPath prefixHeaderRelative = resolveSourcePath(prefixHeaderOptional.get());
       Path prefixHeaderPath =
@@ -1554,7 +1554,7 @@ && shouldEmbedSwiftRuntimeInBundleTarget(bundle)
         getFrameworkAndLibrarySearchPathConfigs(
             targetNode, xcodeNativeTargetAttributesBuilder, includeFrameworks));
 
-    if (!appleConfig.getProjectGeneratorIndexViaBuildFlags()
+    if (!Utils.getShouldIndexViaBuildFlagsForTargetNode(targetNode, appleConfig)
         && !appleConfig.getProjectGeneratorIndexViaCompileArgs()) {
       appendConfigsBuilder.put(
           "HEADER_SEARCH_PATHS",
@@ -1859,7 +1859,7 @@ private ImmutableSet<TargetNode<?>> recursivelyGetBuildDependencies(TargetNode<?
   }
 
   private void addDefaultSettingsAndExtraSettingsForNode(
-      TargetNode<? extends ConstructorArg> targetNode,
+      TargetNode<? extends CommonArg> targetNode,
       Builder<String, String> defaultSettingsBuilder,
       Builder<String, String> extraSettingsBuilder,
       Builder<String, String> appendConfigsBuilder,
@@ -1893,7 +1893,7 @@ private void addDefaultSettingsAndExtraSettingsForNode(
     defaultSettingsBuilder.put("CONFIGURATION_BUILD_DIR", "$BUILT_PRODUCTS_DIR");
     defaultSettingsBuilder.put("EXECUTABLE_PREFIX", "lib");
 
-    if (!appleConfig.getProjectGeneratorIndexViaBuildFlags()
+    if (!Utils.getShouldIndexViaBuildFlagsForTargetNode(targetNode, appleConfig)
         && !appleConfig.getProjectGeneratorIndexViaCompileArgs()) {
       appendConfigsBuilder.put(
           "HEADER_SEARCH_PATHS",