[7.4.0] Add conlyopts and cxxopts attributes to cc rules

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

@@ -270,6 +270,8 @@ public CcCompilationContext getCcCompilationContext() {
   private final List<CppModuleMap> additionalCppModuleMaps = new ArrayList<>();
   private final LinkedHashMap<Artifact, CppSource> compilationUnitSources = new LinkedHashMap<>();
   private ImmutableList<String> copts = ImmutableList.of();
+  private ImmutableList<String> conlyopts = ImmutableList.of();
+  private ImmutableList<String> cxxopts = ImmutableList.of();
   private CoptsFilter coptsFilter = CoptsFilter.alwaysPasses();
   private final Set<String> defines = new LinkedHashSet<>();
   private final Set<String> localDefines = new LinkedHashSet<>();
@@ -594,6 +596,18 @@ public void setCoptsFilter(CoptsFilter coptsFilter) {
     this.coptsFilter = Preconditions.checkNotNull(coptsFilter);
   }
 
+  @CanIgnoreReturnValue
+  public CcCompilationHelper setConlyopts(ImmutableList<String> copts) {
+    this.conlyopts = Preconditions.checkNotNull(copts);
+    return this;
+  }
+
+  @CanIgnoreReturnValue
+  public CcCompilationHelper setCxxopts(ImmutableList<String> copts) {
+    this.cxxopts = Preconditions.checkNotNull(copts);
+    return this;
+  }
+
   /**
    * Adds the given defines to the compiler command line of this target as well as its dependent
    * targets.
@@ -1247,9 +1261,21 @@ public static ImmutableList<String> getCoptsFromOptions(
 
   private ImmutableList<String> getCopts(Artifact sourceFile, Label sourceLabel) {
     ImmutableList.Builder<String> coptsList = ImmutableList.builder();
-    coptsList.addAll(
-        getCoptsFromOptions(cppConfiguration, semantics, sourceFile.getExecPathString()));
+    String sourceFilename = sourceFile.getExecPathString();
+    coptsList.addAll(getCoptsFromOptions(cppConfiguration, semantics, sourceFilename));
     coptsList.addAll(copts);
+
+    if (CppFileTypes.C_SOURCE.matches(sourceFilename)) {
+      coptsList.addAll(conlyopts);
+    }
+
+    if (CppFileTypes.CPP_SOURCE.matches(sourceFilename)
+        || CppFileTypes.CPP_HEADER.matches(sourceFilename)
+        || CppFileTypes.CPP_MODULE_MAP.matches(sourceFilename)
+        || CppFileTypes.CLIF_INPUT_PROTO.matches(sourceFilename)) {
+      coptsList.addAll(cxxopts);
+    }
+
     if (sourceFile != null && sourceLabel != null) {
       coptsList.addAll(collectPerFileCopts(sourceFile, sourceLabel));
     }

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

@@ -2156,6 +2156,8 @@ public Tuple compile(
       String includePrefix,
       String stripIncludePrefix,
       Sequence<?> userCompileFlags, // <String> expected
+      Sequence<?> conlyFlags, // <String> expected
+      Sequence<?> cxxFlags, // <String> expected
       Sequence<?> ccCompilationContexts, // <CcCompilationContext> expected
       Object implementationCcCompilationContextsObject,
       String name,
@@ -2310,6 +2312,8 @@ public Tuple compile(
         .setCopts(
             ImmutableList.copyOf(
                 Sequence.cast(userCompileFlags, String.class, "user_compile_flags")))
+        .setConlyopts(ImmutableList.copyOf(Sequence.cast(conlyFlags, String.class, "conly_flags")))
+        .setCxxopts(ImmutableList.copyOf(Sequence.cast(cxxFlags, String.class, "cxx_flags")))
         .addAdditionalCompilationInputs(
             Sequence.cast(additionalInputs, Artifact.class, "additional_inputs"))
         .addAdditionalInputs(nonCompilationAdditionalInputs)

src/main/java/com/google/devtools/build/lib/starlarkbuildapi/cpp/CcModuleApi.java

@@ -242,6 +242,18 @@ default void compilerFlagExists() {}
             positional = false,
             named = true,
             defaultValue = "[]"),
+        @Param(
+            name = "conly_flags",
+            doc = "Additional list of compilation options for C compiles.",
+            positional = false,
+            named = true,
+            defaultValue = "[]"),
+        @Param(
+            name = "cxx_flags",
+            doc = "Additional list of compilation options for C++ compiles.",
+            positional = false,
+            named = true,
+            defaultValue = "[]"),
         @Param(
             name = "compilation_contexts",
             doc = "Headers from dependencies used for compilation.",
@@ -396,6 +408,8 @@ Tuple compile(
       String includePrefix,
       String stripIncludePrefix,
       Sequence<?> userCompileFlags, // <String> expected
+      Sequence<?> conlyFlags, // <String> expected
+      Sequence<?> cxxFlags, // <String> expected
       Sequence<?> ccCompilationContexts, // <CcCompilationContext> expected
       Object implementationCcCompilationContextsObject,
       String name,

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

@@ -633,7 +633,9 @@ def cc_binary_impl(ctx, additional_linkopts):
         actions = ctx.actions,
         feature_configuration = feature_configuration,
         cc_toolchain = cc_toolchain,
-        user_compile_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions),
+        user_compile_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions, attr = "copts"),
+        conly_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions, attr = "conlyopts"),
+        cxx_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions, attr = "cxxopts"),
         defines = cc_helper.defines(ctx, additional_make_variable_substitutions),
         local_defines = cc_helper.local_defines(ctx, additional_make_variable_substitutions) + cc_helper.get_local_defines_for_runfiles_lookup(ctx, ctx.attr.deps),
         system_includes = cc_helper.system_include_dirs(ctx, additional_make_variable_substitutions),

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

@@ -35,6 +35,8 @@ cc_binary_attrs = {
     ),
     "linkopts": attr.string_list(),
     "copts": attr.string_list(),
+    "conlyopts": attr.string_list(),
+    "cxxopts": attr.string_list(),
     "defines": attr.string_list(),
     "local_defines": attr.string_list(),
     "includes": attr.string_list(),

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

@@ -705,6 +705,8 @@ def _compile(
         include_prefix = "",
         strip_include_prefix = "",
         user_compile_flags = [],
+        conly_flags = [],
+        cxx_flags = [],
         compilation_contexts = [],
         implementation_compilation_contexts = _UNBOUND,
         disallow_pic_outputs = False,
@@ -785,6 +787,8 @@ def _compile(
         include_prefix = include_prefix,
         strip_include_prefix = strip_include_prefix,
         user_compile_flags = user_compile_flags,
+        conly_flags = conly_flags,
+        cxx_flags = cxx_flags,
         compilation_contexts = compilation_contexts,
         implementation_compilation_contexts = implementation_compilation_contexts,
         disallow_pic_outputs = disallow_pic_outputs,

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

@@ -924,10 +924,10 @@ def _expand_make_variables_for_copts(ctx, tokenization, unexpanded_tokens, addit
                 tokens.append(_expand(ctx, token, additional_make_variable_substitutions, targets = targets))
     return tokens
 
-def _get_copts(ctx, feature_configuration, additional_make_variable_substitutions):
-    if not hasattr(ctx.attr, "copts"):
-        fail("could not find rule attribute named: 'copts'")
-    attribute_copts = ctx.attr.copts
+def _get_copts(ctx, feature_configuration, additional_make_variable_substitutions, attr = "copts"):
+    if not hasattr(ctx.attr, attr):
+        fail("could not find rule attribute named: '{}'".format(attr))
+    attribute_copts = getattr(ctx.attr, attr)
     tokenization = not (cc_common.is_enabled(feature_configuration = feature_configuration, feature_name = "no_copts_tokenization") or "no_copts_tokenization" in ctx.features)
     expanded_attribute_copts = _expand_make_variables_for_copts(ctx, tokenization, attribute_copts, additional_make_variable_substitutions)
     return expanded_attribute_copts

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

@@ -55,7 +55,9 @@ def _cc_library_impl(ctx):
         name = ctx.label.name,
         cc_toolchain = cc_toolchain,
         feature_configuration = feature_configuration,
-        user_compile_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions),
+        user_compile_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions, attr = "copts"),
+        conly_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions, attr = "conlyopts"),
+        cxx_flags = cc_helper.get_copts(ctx, feature_configuration, additional_make_variable_substitutions, attr = "cxxopts"),
         defines = cc_helper.defines(ctx, additional_make_variable_substitutions),
         local_defines = cc_helper.local_defines(ctx, additional_make_variable_substitutions) + cc_helper.get_local_defines_for_runfiles_lookup(ctx, ctx.attr.deps + ctx.attr.implementation_deps),
         system_includes = cc_helper.system_include_dirs(ctx, additional_make_variable_substitutions),
@@ -581,6 +583,8 @@ attrs = {
     "includes": attr.string_list(),
     "defines": attr.string_list(),
     "copts": attr.string_list(),
+    "conlyopts": attr.string_list(),
+    "cxxopts": attr.string_list(),
     "hdrs_check": attr.string(default = cc_internal.default_hdrs_check_computed_default()),
     "local_defines": attr.string_list(),
     "deps": attr.label_list(

src/test/java/com/google/devtools/build/lib/rules/cpp/CompileBuildVariablesTest.java

@@ -102,6 +102,48 @@ public void testPresenceOfUserCompileFlags() throws Exception {
     assertThat(copts).contains("-foo");
   }
 
+  @Test
+  public void testPresenceOfConlyFlags() throws Exception {
+    useConfiguration(
+        "--conlyopt=-foo", "--cxxopt=-not-passed", "--per_file_copt=//x:bin@-per-file");
+
+    scratch.file(
+        "x/BUILD",
+        "cc_binary(name = 'bin', srcs = ['bin.c'], copts = ['-bar'], conlyopts = ['-baz'], cxxopts"
+            + " = ['-not-passed'])");
+    scratch.file("x/bin.c");
+
+    CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin");
+
+    ImmutableList<String> copts =
+        CcToolchainVariables.toStringList(
+            variables, CompileBuildVariables.USER_COMPILE_FLAGS.getVariableName(), PathMapper.NOOP);
+    assertThat(copts)
+        .containsExactlyElementsIn(ImmutableList.<String>of("-foo", "-bar", "-baz", "-per-file"))
+        .inOrder();
+  }
+
+  @Test
+  public void testCxxFlagsOrder() throws Exception {
+    useConfiguration(
+        "--cxxopt=-foo", "--conlyopt=-not-passed", "--per_file_copt=//x:bin@-per-file");
+
+    scratch.file(
+        "x/BUILD",
+        "cc_binary(name = 'bin', srcs = ['bin.cc'], copts = ['-bar'], cxxopts = ['-baz'], conlyopts"
+            + " = ['-not-passed'])");
+    scratch.file("x/bin.cc");
+
+    CcToolchainVariables variables = getCompileBuildVariables("//x:bin", "bin");
+
+    ImmutableList<String> copts =
+        CcToolchainVariables.toStringList(
+            variables, CompileBuildVariables.USER_COMPILE_FLAGS.getVariableName(), PathMapper.NOOP);
+    assertThat(copts)
+        .containsExactlyElementsIn(ImmutableList.<String>of("-foo", "-bar", "-baz", "-per-file"))
+        .inOrder();
+  }
+
   @Test
   public void testPerFileCoptsAreInUserCompileFlags() throws Exception {
     scratch.file("x/BUILD", "cc_binary(name = 'bin', srcs = ['bin.cc'])");