Automated rollback of commit 3fe2a1c.

PiperOrigin-RevId: 792651764
Change-Id: I172c5bd194508df3c58c9a8f3666ff6cd4d0520f

Author: hvadehra

src/main/java/com/google/devtools/build/lib/rules/cpp/CcStarlarkInternal.java

@@ -15,7 +15,6 @@
 package com.google.devtools.build.lib.rules.cpp;
 
 import static com.google.common.collect.ImmutableList.toImmutableList;
-import static com.google.devtools.build.lib.rules.cpp.CcModule.nullIfNone;
 import static com.google.devtools.build.lib.rules.cpp.CppHelper.asDict;
 
 import com.google.common.base.Strings;
@@ -954,41 +953,73 @@ public Artifact createCompileActionTemplate(
       documented = false,
       parameters = {
         @Param(name = "action_construction_context", positional = false, named = true),
+        @Param(name = "cc_compilation_context", positional = false, named = true),
+        @Param(name = "cc_toolchain", positional = false, named = true),
         @Param(name = "configuration", positional = false, named = true),
+        @Param(name = "conlyopts", positional = false, named = true, defaultValue = "[]"),
+        @Param(name = "copts", positional = false, named = true, defaultValue = "[]"),
+        @Param(name = "cpp_configuration", positional = false, named = true),
+        @Param(name = "cxxopts", positional = false, named = true, defaultValue = "[]"),
+        @Param(name = "fdo_context", positional = false, named = true, defaultValue = "None"),
+        @Param(
+            name = "auxiliary_fdo_inputs",
+            positional = false,
+            named = true,
+            defaultValue = "None"),
         @Param(
             name = "feature_configuration",
             positional = false,
             named = true), // FeatureConfigurationForStarlark
         @Param(name = "use_pic", positional = false, named = true),
         @Param(name = "label", positional = false, named = true),
         @Param(name = "common_compile_build_variables", positional = false, named = true),
-        @Param(name = "specific_compile_build_variables", positional = false, named = true),
+        @Param(name = "fdo_build_variables", positional = false, named = true),
         @Param(name = "cpp_semantics", positional = false, named = true),
+        @Param(name = "source_label", positional = false, named = true),
         @Param(name = "output_name_base", positional = false, named = true),
         @Param(name = "cpp_compile_action_builder", positional = false, named = true)
       })
   public Artifact createParseHeaderAction(
       StarlarkRuleContext starlarkRuleContext,
+      CcCompilationContext ccCompilationContext,
+      StarlarkInfo ccToolchain,
       BuildConfigurationValue configuration,
+      Sequence<?> conlyopts,
+      Sequence<?> copts,
+      CppConfiguration cppConfiguration,
+      Sequence<?> cxxopts,
+      StructImpl fdoContext,
+      Depset auxiliaryFdoInputs,
       FeatureConfigurationForStarlark featureConfigurationForStarlark,
       boolean generatePicAction,
       Label label,
       CcToolchainVariables commonCompileBuildVariables,
-      CcToolchainVariables specificCompileBuildVariables,
+      Dict<?, ?> fdoBuildVariables,
       CppSemantics semantics,
+      Label sourceLabel,
       String outputNameBase,
       CppCompileActionBuilder builder)
       throws RuleErrorException, EvalException {
     return CcStaticCompilationHelper.createParseHeaderAction(
         starlarkRuleContext.getRuleContext(),
+        ccCompilationContext,
+        CcToolchainProvider.create(ccToolchain),
         configuration,
+        Sequence.cast(conlyopts, String.class, "conlyopts").getImmutableList(),
+        Sequence.cast(copts, String.class, "copts").getImmutableList(),
+        cppConfiguration,
+        Sequence.cast(cxxopts, String.class, "cxxopts").getImmutableList(),
+        new FdoContext(fdoContext),
+        Depset.cast(auxiliaryFdoInputs, Artifact.class, "auxiliary_fdo_inputs"),
         featureConfigurationForStarlark.getFeatureConfiguration(),
         generatePicAction,
         label,
         commonCompileBuildVariables,
-        specificCompileBuildVariables,
+        ImmutableMap.copyOf(
+            Dict.cast(fdoBuildVariables, String.class, String.class, "fdo_build_variables")),
         starlarkRuleContext.getRuleContext().getRuleErrorConsumer(),
         semantics,
+        sourceLabel,
         outputNameBase,
         builder);
   }
@@ -1112,9 +1143,6 @@ public CppCompileActionBuilder createCppCompileActionBuilder(
         @Param(name = "source_artifact", positional = false, named = true),
         @Param(name = "additional_compilation_inputs", positional = false, named = true),
         @Param(name = "additional_include_scanning_roots", positional = false, named = true),
-        @Param(name = "output_file", positional = false, named = true, defaultValue = "None"),
-        @Param(name = "dotd_file", positional = false, named = true, defaultValue = "None"),
-        @Param(name = "diagnostics_file", positional = false, named = true, defaultValue = "None"),
       })
   public CppCompileActionBuilder createCppCompileActionBuilderWithInputs(
       StarlarkRuleContext actionConstructionContext,
@@ -1126,10 +1154,7 @@ public CppCompileActionBuilder createCppCompileActionBuilderWithInputs(
       CppSemantics semantics,
       Artifact sourceArtifact,
       Sequence<?> additionalCompilationInputs,
-      Sequence<?> additionalIncludeScanningRoots,
-      Object outputFile,
-      Object dotdFile,
-      Object diagnosticsFile)
+      Sequence<?> additionalIncludeScanningRoots)
       throws EvalException {
     CppCompileActionBuilder builder =
         createCppCompileActionBuilder(
@@ -1150,10 +1175,6 @@ public CppCompileActionBuilder createCppCompileActionBuilderWithInputs(
                 additionalIncludeScanningRoots,
                 Artifact.class,
                 "additional_include_scanning_roots"));
-    builder.setOutputs(
-        nullIfNone(outputFile, Artifact.class),
-        nullIfNone(dotdFile, Artifact.class),
-        nullIfNone(diagnosticsFile, Artifact.class));
     return builder;
   }
 

src/main/java/com/google/devtools/build/lib/rules/cpp/CcStaticCompilationHelper.java

@@ -527,24 +527,59 @@ static void createModuleCodegenAction(
 
   static Artifact createParseHeaderAction(
       ActionConstructionContext actionConstructionContext,
+      CcCompilationContext ccCompilationContext,
+      CcToolchainProvider ccToolchain,
       BuildConfigurationValue configuration,
+      ImmutableList<String> conlyopts,
+      ImmutableList<String> copts,
+      CppConfiguration cppConfiguration,
+      ImmutableList<String> cxxopts,
+      FdoContext fdoContext,
+      NestedSet<Artifact> auxiliaryFdoInputs,
       FeatureConfiguration featureConfiguration,
       boolean generatePicAction,
       Label label,
       CcToolchainVariables commonToolchainVariables,
-      CcToolchainVariables specificToolchainVariables,
+      ImmutableMap<String, String> fdoBuildVariables,
       RuleErrorConsumer ruleErrorConsumer,
       CppSemantics semantics,
+      Label sourceLabel,
       String outputNameBase,
       CppCompileActionBuilder builder)
       throws RuleErrorException, EvalException {
     builder
+        .setOutputs(
+            actionConstructionContext,
+            ruleErrorConsumer,
+            label,
+            ArtifactCategory.PROCESSED_HEADER,
+            outputNameBase)
         // If we generate pic actions, we prefer the header actions to use the pic artifacts.
         .setPicMode(generatePicAction);
     builder.setVariables(
-        CcToolchainVariables.builder(commonToolchainVariables)
-            .addAllNonTransitive(specificToolchainVariables)
-            .build());
+        setupSpecificCompileBuildVariables(
+            commonToolchainVariables,
+            ccCompilationContext,
+            conlyopts,
+            copts,
+            cppConfiguration,
+            cxxopts,
+            fdoContext,
+            auxiliaryFdoInputs,
+            featureConfiguration,
+            semantics,
+            builder,
+            sourceLabel,
+            generatePicAction,
+            /* needsFdoBuildVariables= */ false,
+            fdoBuildVariables,
+            ccCompilationContext.getCppModuleMap(),
+            /* enableCoverage= */ false,
+            /* gcnoFile= */ null,
+            /* isUsingFission= */ false,
+            /* dwoFile= */ null,
+            /* ltoIndexingFile= */ null,
+            /* additionalBuildVariables= */ ImmutableMap.of()));
     semantics.finalizeCompileActionBuilder(configuration, featureConfiguration, builder);
     CppCompileAction compileAction = builder.buildOrThrowRuleError(ruleErrorConsumer);
     actionConstructionContext.registerAction(compileAction);

src/main/starlark/builtins_bzl/common/cc/compile/compile.bzl

@@ -24,8 +24,6 @@ load(
     "should_create_per_object_debug_info",
 )
 load(":common/cc/compile/cc_compilation_helper.bzl", "cc_compilation_helper")
-load(":common/cc/compile/compile_build_variables.bzl", "get_specific_compile_build_variables")
-load(":common/cc/semantics.bzl", _starlark_cc_semantics = "semantics")
 load(":common/paths.bzl", "paths")
 
 cc_common_internal = _builtins.internal.cc_common
@@ -728,38 +726,8 @@ def _create_cc_compile_actions(
             _basename_without_extension(source_artifact) in compiled_basenames):
             continue
 
-        output_name_base = cc_internal.get_artifact_name_for_category(
-            cc_toolchain = cc_toolchain,
-            category = artifact_category.GENERATED_HEADER,
-            output_name = output_name_map[source_artifact],
-        )
-        output_file = _get_compile_output_file(
-            action_construction_context,
-            label,
-            output_name = cc_internal.get_artifact_name_for_category(
-                cc_toolchain = cc_toolchain,
-                category = artifact_category.PROCESSED_HEADER,
-                output_name = output_name_base,
-            ),
-        )
-        dotd_file = _get_compile_output_file(
-            action_construction_context,
-            label,
-            output_name = cc_internal.get_artifact_name_for_category(
-                cc_toolchain = cc_toolchain,
-                category = artifact_category.INCLUDED_FILE_LIST,
-                output_name = output_name_base,
-            ),
-        ) if _dotd_files_enabled(language, cpp_configuration, feature_configuration) else None
-        diagnostics_file = _get_compile_output_file(
-            action_construction_context,
-            label,
-            output_name = cc_internal.get_artifact_name_for_category(
-                cc_toolchain = cc_toolchain,
-                category = artifact_category.SERIALIZED_DIAGNOSTICS_FILE,
-                output_name = output_name_base,
-            ),
-        ) if _serialized_diagnostics_file_enabled(feature_configuration) else None
+        output_name = output_name_map[source_artifact]
+
         cpp_compile_action_builder = cc_internal.create_cpp_compile_action_builder_with_inputs(
             action_construction_context = action_construction_context,
             cc_compilation_context = cc_compilation_context,
@@ -771,38 +739,30 @@ def _create_cc_compile_actions(
             source_artifact = source_artifact,
             additional_compilation_inputs = additional_compilation_inputs,
             additional_include_scanning_roots = additional_include_scanning_roots,
-            output_file = output_file,
-            dotd_file = dotd_file,
-            diagnostics_file = diagnostics_file,
         )
-        specific_compile_build_variables = get_specific_compile_build_variables(
-            feature_configuration,
-            use_pic = generate_pic_action,
-            source_file = source_artifact,
-            output_file = output_file,
-            dotd_file = dotd_file,
-            diagnostics_file = diagnostics_file,
-            cpp_module_map = cc_compilation_context.module_map(),
-            direct_module_maps = cc_compilation_context.direct_module_maps,
-            user_compile_flags = _get_copts(
-                language = language,
-                cpp_configuration = cpp_configuration,
-                source_file = source_artifact,
-                conlyopts = conlyopts,
-                copts = copts,
-                cxxopts = cxxopts,
-                label = cpp_source.label,
-            ),
+        output_name_base = cc_internal.get_artifact_name_for_category(
+            cc_toolchain = cc_toolchain,
+            category = artifact_category.GENERATED_HEADER,
+            output_name = output_name,
         )
         header_token_file = cc_internal.create_parse_header_action(
             action_construction_context = action_construction_context,
+            cc_compilation_context = cc_compilation_context,
+            cc_toolchain = cc_toolchain,
             configuration = configuration,
+            conlyopts = conlyopts,
+            copts = copts,
+            cpp_configuration = cpp_configuration,
+            cxxopts = cxxopts,
+            fdo_context = fdo_context,
+            auxiliary_fdo_inputs = auxiliary_fdo_inputs,
             feature_configuration = feature_configuration,
             use_pic = generate_pic_action,
             label = label,
             common_compile_build_variables = common_compile_build_variables,
-            specific_compile_build_variables = specific_compile_build_variables,
+            fdo_build_variables = fdo_build_variables,
             cpp_semantics = cpp_semantics,
+            source_label = cpp_source.label,
             output_name_base = output_name_base,
             cpp_compile_action_builder = cpp_compile_action_builder,
         )
@@ -861,63 +821,6 @@ def _create_module_action(
         bitcode_output = False,
     )
 
-def _get_compile_output_file(ctx, label, *, output_name):
-    return ctx.actions.declare_file(paths.join("_objs", label.name, output_name))
-
-def _dotd_files_enabled(language, cpp_configuration, feature_configuration):
-    enabled_in_config = (
-        _starlark_cc_semantics.dotd_files_enabled(cpp_configuration) if language == "cpp" else cpp_configuration.objc_should_generate_dotd_files()
-    )
-    return (
-        enabled_in_config and
-        not feature_configuration.is_enabled("parse_showincludes") and
-        not feature_configuration.is_enabled("no_dotd_file")
-    )
-
-def _serialized_diagnostics_file_enabled(feature_configuration):
-    return feature_configuration.is_enabled("serialized_diagnostics_file")
-
-_SOURCE_TYPES_FOR_CXXOPTS = set(
-    extensions.CC_SOURCE +
-    extensions.CC_HEADER +
-    [".cppmap"] +  # cpp module map
-    [".pcm", ".gcm", ".ifc"] +  # clif input proto
-    [".mm"],  # objc source
-)
-
-def _get_copts(
-        language,
-        cpp_configuration,
-        source_file,
-        conlyopts,
-        copts,
-        cxxopts,
-        label):
-    extension = "." + source_file.extension if source_file.extension else ""
-    result = []
-    result.extend(_copts_from_options(language, cpp_configuration, extension))
-    result.extend(copts)
-    if extension in extensions.C_SOURCE:
-        result.extend(conlyopts)
-    if extension in _SOURCE_TYPES_FOR_CXXOPTS:
-        result.extend(cxxopts)
-    if label:
-        result.extend(cc_internal.per_file_copts(cpp_configuration, source_file, label))
-    return result
-
-def _copts_from_options(language, cpp_configuration, extension):
-    result = []
-    result.extend(cpp_configuration.copts)
-    if extension in extensions.C_SOURCE:
-        result.extend(cpp_configuration.conlyopts)
-    if extension in _SOURCE_TYPES_FOR_CXXOPTS:
-        result.extend(cpp_configuration.cxxopts)
-    if extension in [".m", ".mm"] or (
-        language == "objc" and extension in extensions.CC_HEADER
-    ):
-        result.extend(cpp_configuration.objccopts)
-    return result
-
 def _calculate_output_name_map_by_type(sources, prefix_dir):
     return (
         _calculate_output_name_map(