pass down feature_configuration

Author: keith

cc/common/cc_helper.bzl

@@ -1025,17 +1025,10 @@ def _linkopts(ctx, additional_make_variable_substitutions, cc_toolchain):
         fail("in linkopts attribute of cc_library rule {}: Apple builds do not support statically linked binaries".format(ctx.label))
     return tokens
 
-def _get_coverage_environment(ctx, cc_config, cc_toolchain):
+def _get_coverage_environment(ctx, cc_config, cc_toolchain, feature_configuration):
     if not ctx.configuration.coverage_enabled:
         return {}
 
-    feature_configuration = cc_common.configure_features(
-        ctx = ctx,
-        cc_toolchain = cc_toolchain,
-        requested_features = ctx.features,
-        unsupported_features = ctx.disabled_features,
-    )
-
     # buildifier: disable=unsorted-dict-items
     env = {
         "COVERAGE_GCOV_PATH": _tool_path(cc_toolchain, "gcov", feature_configuration, ACTION_NAMES.gcov),
@@ -1050,15 +1043,15 @@ def _get_coverage_environment(ctx, cc_config, cc_toolchain):
         env["FDO_DIR"] = cc_config.fdo_instrument()
     return env
 
-def _create_cc_instrumented_files_info(ctx, cc_config, cc_toolchain, metadata_files, virtual_to_original_headers = None):
+def _create_cc_instrumented_files_info(ctx, cc_config, cc_toolchain, feature_configuration, metadata_files, virtual_to_original_headers = None):
     source_extensions = extensions.CC_SOURCE + \
                         extensions.C_SOURCE + \
                         extensions.CC_HEADER + \
                         extensions.ASSEMBLER_WITH_C_PREPROCESSOR + \
                         extensions.ASSEMBLER
     coverage_environment = {}
     if ctx.configuration.coverage_enabled:
-        coverage_environment = _get_coverage_environment(ctx, cc_config, cc_toolchain)
+        coverage_environment = _get_coverage_environment(ctx, cc_config, cc_toolchain, feature_configuration)
     coverage_support_files = cc_toolchain._coverage_files if ctx.configuration.coverage_enabled else depset([])
     info = coverage_common.instrumented_files_info(
         ctx = ctx,

cc/private/rules_impl/cc_binary_impl.bzl

@@ -107,6 +107,7 @@ def _add_transitive_info_providers(ctx, cc_toolchain, cpp_config, feature_config
         ctx = ctx,
         cc_config = cpp_config,
         cc_toolchain = cc_toolchain,
+        feature_configuration = feature_configuration,
         metadata_files = additional_meta_data + gcno_files + pic_gcno_files,
         virtual_to_original_headers =
             compilation_context.virtual_to_original_headers() if hasattr(compilation_context, "virtual_to_original_headers") else compilation_context._virtual_to_original_headers,

cc/private/rules_impl/cc_library_impl.bzl

@@ -273,6 +273,7 @@ def _cc_library_impl(ctx):
         ctx = ctx,
         cc_config = ctx.fragments.cpp,
         cc_toolchain = cc_toolchain,
+        feature_configuration = feature_configuration,
         metadata_files = gcno_files + pic_gcno_files,
     )
 

cc/private/rules_impl/objc_library.bzl

@@ -14,6 +14,7 @@
 
 """objc_library Starlark implementation replacing native"""
 
+load("@rules_cc//cc/common:cc_common.bzl", "cc_common")
 load("//cc:find_cc_toolchain.bzl", "find_cc_toolchain", "use_cc_toolchain")
 load("//cc/common:cc_helper.bzl", "cc_helper")
 load("//cc/common:cc_info.bzl", "CcInfo")
@@ -85,12 +86,18 @@ def _objc_library_impl(ctx):
         pic_gcno_files = compilation_outputs.pic_gcno_files()
     else:
         pic_gcno_files = compilation_outputs._pic_gcno_files
+    feature_configuration = cc_common.configure_features(
+        ctx = ctx,
+        cc_toolchain = cc_toolchain,
+        requested_features = ctx.features,
+        unsupported_features = ctx.disabled_features,
+    )
     instrumented_files_info = coverage_common.instrumented_files_info(
         ctx = ctx,
         source_attributes = ["srcs", "non_arc_srcs", "hdrs"],
         dependency_attributes = ["deps", "data", "binary", "xctest_app"],
         extensions = extensions.NON_CPP_SOURCES + extensions.CPP_SOURCES + extensions.HEADERS,
-        coverage_environment = cc_helper.get_coverage_environment(ctx, ctx.fragments.cpp, cc_toolchain),
+        coverage_environment = cc_helper.get_coverage_environment(ctx, ctx.fragments.cpp, cc_toolchain, feature_configuration),
         # TODO(cmita): Use ctx.coverage_instrumented() instead when rules_swift can access
         # cc_toolchain.coverage_files and the coverage_support_files parameter of
         # coverage_common.instrumented_files_info(...)