Merge pull request #25196 from protocolbuffers/bazel_binary_fix

Bazel binary fix

Author: mkruskal-google

BUILD.bazel

@@ -566,7 +566,13 @@ proto_lang_toolchain(
     command_line = "--cpp_out=$(OUT)",
     plugin = "//src/google/protobuf/compiler/cpp:protoc-gen-cpp",
     plugin_format_flag = "--plugin=protoc-gen-cpp=%s",
-    protoc_minimal_do_not_use = "//src/google/protobuf/compiler:protoc_minimal",
+    protoc_minimal_do_not_use = select({
+        # Set minimal protoc if prefer_prebuilt_protoc.flag_set is true since a prebuilt for protoc_minimal is not available
+        # TODO: Add a flag to switch between minimal and full protoc with proto_lang_toolchain once we have a minimal protoc binary.
+        # Setting this attribute to None will make the toolchain to pick the full protoc binary.
+        "//bazel/toolchains:prefer_prebuilt_protoc.flag_set": None,
+        "//conditions:default": "//src/google/protobuf/compiler:protoc_minimal",
+    }),
     runtime = "//src/google/protobuf",
     visibility = ["//visibility:public"],
 )

bazel/tests/BUILD

@@ -1,4 +1,7 @@
+load("@bazel_skylib//:bzl_library.bzl", "bzl_library")
+load("//bazel:proto_library.bzl", "proto_library")
 load(":bazel_proto_library_tests.bzl", "bazel_proto_library_test_suite")
+load(":cc_toolchain_tests.bzl", "cc_toolchain_test_suite")
 load(":java_proto_library_tests.bzl", "java_proto_library_test_suite")
 load(":proto_common_check_collocated_tests.bzl", "proto_common_check_collocated_test_suite")
 load(":proto_common_compile_tests.bzl", "proto_common_compile_test_suite")
@@ -17,4 +20,6 @@ proto_common_check_collocated_test_suite(name = "proto_common_check_collocated_t
 
 bazel_proto_library_test_suite(name = "bazel_proto_library_test_suite")
 
+cc_toolchain_test_suite(name = "cc_toolchain_test_suite")
+
 java_proto_library_test_suite(name = "java_proto_library_test_suite")

bazel/tests/cc_toolchain_tests.bzl

@@ -0,0 +1,81 @@
+# Protocol Buffers - Google's data interchange format
+# Copyright 2025 Google Inc.  All rights reserved.
+#
+# Use of this source code is governed by a BSD-style
+# license that can be found in the LICENSE file or at
+# https://developers.google.com/open-source/licenses/bsd
+"""Tests for cc_toolchain prebuilt protoc configuration."""
+
+load("@rules_testing//lib:analysis_test.bzl", "analysis_test", "test_suite")
+load("@rules_testing//lib:truth.bzl", "matching")
+load("@rules_testing//lib:util.bzl", "util")
+load("//bazel:proto_library.bzl", "proto_library")
+load("//bazel/tests/testdata:compile_rule.bzl", "compile_rule")
+
+_PREFER_PREBUILT_PROTOC = str(Label("//bazel/toolchains:prefer_prebuilt_protoc"))
+
+def cc_toolchain_test_suite(name):
+    test_suite(
+        name = name,
+        tests = [
+            _test_cc_toolchain_uses_full_protoc_when_prefer_prebuilt_flag_set,
+            _test_cc_toolchain_uses_protoc_minimal_by_default,
+        ],
+    )
+
+def _test_cc_toolchain_uses_full_protoc_when_prefer_prebuilt_flag_set(name):
+    util.helper_target(
+        proto_library,
+        name = name + "_proto",
+        srcs = ["A.proto"],
+    )
+    util.helper_target(
+        compile_rule,
+        name = name + "_compile",
+        proto_dep = ":" + name + "_proto",
+        toolchain = "//:cc_toolchain",
+    )
+
+    analysis_test(
+        name = name,
+        target = name + "_compile",
+        impl = _test_cc_toolchain_uses_full_protoc_when_prefer_prebuilt_flag_set_impl,
+        config_settings = {_PREFER_PREBUILT_PROTOC: True},
+    )
+
+def _test_cc_toolchain_uses_full_protoc_when_prefer_prebuilt_flag_set_impl(env, target):
+    # Find the compile action
+    action = env.expect.that_target(target).action_named("GenProto")
+
+    # When prefer_prebuilt_protoc is True, protoc_minimal_do_not_use is None,
+    # so the cc_toolchain should use the full protoc (not protoc_minimal).
+    # The protoc path should end with "/protoc" not contain "protoc_minimal"
+    action.argv().contains_predicate(matching.str_matches("*/protoc"))
+    action.argv().not_contains_predicate(matching.str_matches("*protoc_minimal*"))
+
+def _test_cc_toolchain_uses_protoc_minimal_by_default(name):
+    util.helper_target(
+        proto_library,
+        name = name + "_proto",
+        srcs = ["A.proto"],
+    )
+    util.helper_target(
+        compile_rule,
+        name = name + "_compile",
+        proto_dep = ":" + name + "_proto",
+        toolchain = "//:cc_toolchain",
+    )
+
+    analysis_test(
+        name = name,
+        target = name + "_compile",
+        impl = _test_cc_toolchain_uses_protoc_minimal_by_default_impl,
+    )
+
+def _test_cc_toolchain_uses_protoc_minimal_by_default_impl(env, target):
+    # Find the compile action
+    action = env.expect.that_target(target).action_named("GenProto")
+
+    # By default (prefer_prebuilt_protoc is False), protoc_minimal_do_not_use is set,
+    # so the cc_toolchain should use protoc_minimal.
+    action.argv().contains_predicate(matching.str_matches("*protoc_minimal*"))

bazel/toolchains/BUILD

@@ -53,7 +53,11 @@ bool_flag(
 config_setting(
     name = "prefer_prebuilt_protoc.flag_set",
     flag_values = {":prefer_prebuilt_protoc": "true"},
-    visibility = ["//bazel/private/toolchains/prebuilt:__pkg__"],
+    visibility = [
+        "//bazel/private/toolchains/prebuilt:__pkg__",
+        # Needed by cc_toolchain to switch between minimal and full protoc
+        "//:__pkg__",
+    ],
 )
 
 # The public API users set to disable the validation action failing.

cmake/conformance.cmake

@@ -38,12 +38,16 @@ add_custom_command(
     ${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
     ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.h
     ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.cc
+    ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.h
+    ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.cc
   DEPENDS ${protobuf_PROTOC_EXE}
     ${protobuf_SOURCE_DIR}/conformance/conformance.proto
     ${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition2023.proto
+    ${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition_unstable.proto
   COMMAND ${protobuf_PROTOC_EXE}
       ${protobuf_SOURCE_DIR}/conformance/conformance.proto
       ${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition2023.proto
+      ${protobuf_SOURCE_DIR}/conformance/test_protos/test_messages_edition_unstable.proto
       --proto_path=${protobuf_SOURCE_DIR}
       --cpp_out=${protobuf_BINARY_DIR}
 )
@@ -89,6 +93,8 @@ add_library(libconformance_common STATIC
   ${protobuf_BINARY_DIR}/conformance/conformance.pb.cc
   ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.h
   ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition2023.pb.cc
+  ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.h
+  ${protobuf_BINARY_DIR}/conformance/test_protos/test_messages_edition_unstable.pb.cc
   ${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.h
   ${protobuf_BINARY_DIR}/editions/golden/test_messages_proto3_editions.pb.cc
   ${protobuf_BINARY_DIR}/editions/golden/test_messages_proto2_editions.pb.h

conformance/BUILD

@@ -139,6 +139,7 @@ cc_library(
         "//:test_messages_proto2_cc_proto",
         "//:test_messages_proto3_cc_proto",
         "//conformance/test_protos:test_messages_edition2023_cc_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_cc_proto",
         "//editions:test_messages_proto2_editions_cc_proto",
         "//editions:test_messages_proto3_editions_cc_proto",
         "//src/google/protobuf",
@@ -167,6 +168,7 @@ cc_library(
         "//:test_messages_proto2_cc_proto",
         "//:test_messages_proto3_cc_proto",
         "//conformance/test_protos:test_messages_edition2023_cc_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_cc_proto",
         "//editions:test_messages_proto2_editions_cc_proto",
         "//editions:test_messages_proto3_editions_cc_proto",
         "//src/google/protobuf",
@@ -250,6 +252,7 @@ cc_test(
         "//:test_messages_proto2_cc_proto",
         "//:test_messages_proto3_cc_proto",
         "//conformance/test_protos:test_messages_edition2023_cc_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_cc_proto",
         "//editions:test_messages_proto2_editions_cc_proto",
         "//editions:test_messages_proto3_editions_cc_proto",
         "@googletest//:gtest",
@@ -449,6 +452,7 @@ cc_binary(
         "//:type_cc_proto",
         "//:wrappers_cc_proto",
         "//conformance/test_protos:test_messages_edition2023_cc_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_cc_proto",
         "//editions:test_messages_proto2_editions_cc_proto",
         "//editions:test_messages_proto3_editions_cc_proto",
         "//src/google/protobuf",
@@ -481,6 +485,7 @@ java_binary(
         "//:test_messages_proto2_java_proto",
         "//:test_messages_proto3_java_proto",
         "//conformance/test_protos:test_messages_edition2023_java_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_java_proto",
         "//editions:test_messages_proto2_editions_java_proto",
         "//editions:test_messages_proto3_editions_java_proto",
     ],
@@ -501,6 +506,7 @@ java_binary(
         "//:test_messages_proto2_java_proto_lite",
         "//:test_messages_proto3_java_proto_lite",
         "//conformance/test_protos:test_messages_edition2023_java_proto_lite",
+        "//conformance/test_protos:test_messages_edition_unstable_java_proto_lite",
         "//editions:test_messages_proto2_editions_java_proto_lite",
         "//editions:test_messages_proto3_editions_java_proto_lite",
     ],
@@ -520,6 +526,7 @@ py_binary(
         ":conformance_py_proto",
         "//:protobuf_python",
         "//conformance/test_protos:test_messages_edition2023_py_pb2",
+        "//conformance/test_protos:test_messages_edition_unstable_py_pb2",
         "//editions:test_messages_proto2_editions_py_pb2",
         "//editions:test_messages_proto3_editions_py_pb2",
         "//python:_message",  # Make upb visible if we need it.
@@ -581,6 +588,7 @@ inline_sh_binary(
     visibility = ["//csharp:__subpackages__"],
     deps = [
         "//conformance/test_protos:test_messages_edition2023_csharp_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_csharp_proto",
         "//csharp/src/Google.Protobuf.Conformance:conformance_runfiles",
     ],
 )
@@ -596,6 +604,7 @@ objc_library(
         "//:test_messages_proto2_objc_proto",
         "//:test_messages_proto3_objc_proto",
         "//conformance/test_protos:test_messages_edition2023_objc_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_objc_proto",
         "//editions:test_messages_proto2_editions_objc_proto",
         "//editions:test_messages_proto3_editions_objc_proto",
     ],
@@ -619,6 +628,7 @@ rb_binary(
     deps = [
         ":conformance_ruby_proto",
         "//conformance/test_protos:test_messages_edition2023_ruby_proto",
+        "//conformance/test_protos:test_messages_edition_unstable_ruby_proto",
         "//ruby:conformance_editions_test_ruby_proto",
         "//ruby:conformance_test_ruby_proto",
         "//ruby:protobuf",

conformance/ConformanceJava.java

@@ -17,6 +17,8 @@
 import com.google.protobuf.util.JsonFormat.TypeRegistry;
 import com.google.protobuf_test_messages.edition2023.TestAllTypesEdition2023;
 import com.google.protobuf_test_messages.edition2023.TestMessagesEdition2023;
+import com.google.protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable;
+import com.google.protobuf_test_messages.edition_unstable.TestMessagesEditionUnstableProto;
 import com.google.protobuf_test_messages.editions.proto2.TestMessagesProto2Editions;
 import com.google.protobuf_test_messages.editions.proto3.TestMessagesProto3Editions;
 import com.google.protobuf_test_messages.proto2.TestMessagesProto2;
@@ -217,6 +219,8 @@ private Class<? extends AbstractMessage> createTestMessage(String messageType) {
         return TestAllTypesProto2.class;
       case "protobuf_test_messages.editions.TestAllTypesEdition2023":
         return TestAllTypesEdition2023.class;
+      case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
+        return TestAllTypesEditionUnstable.class;
       case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
         return TestMessagesProto3Editions.TestAllTypesProto3.class;
       case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":
@@ -235,6 +239,8 @@ private Class<?> createTestFile(String messageType) {
         return TestMessagesProto2.class;
       case "protobuf_test_messages.editions.TestAllTypesEdition2023":
         return TestMessagesEdition2023.class;
+      case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
+        return TestMessagesEditionUnstableProto.class;
       case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
         return TestMessagesProto3Editions.class;
       case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":

conformance/ConformanceJavaLite.java

@@ -15,6 +15,8 @@
 import com.google.protobuf.conformance.Conformance;
 import com.google.protobuf_test_messages.edition2023.TestAllTypesEdition2023;
 import com.google.protobuf_test_messages.edition2023.TestMessagesEdition2023;
+import com.google.protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable;
+import com.google.protobuf_test_messages.edition_unstable.TestMessagesEditionUnstableProto;
 import com.google.protobuf_test_messages.editions.proto2.TestMessagesProto2Editions;
 import com.google.protobuf_test_messages.editions.proto3.TestMessagesProto3Editions;
 import com.google.protobuf_test_messages.proto2.TestMessagesProto2;
@@ -216,6 +218,8 @@ private Class<? extends AbstractMessageLite> createTestMessage(String messageTyp
         return TestAllTypesProto2.class;
       case "protobuf_test_messages.editions.TestAllTypesEdition2023":
         return TestAllTypesEdition2023.class;
+      case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
+        return TestAllTypesEditionUnstable.class;
       case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
         return TestMessagesProto3Editions.TestAllTypesProto3.class;
       case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":
@@ -234,6 +238,8 @@ private Class<?> createTestFile(String messageType) {
         return TestMessagesProto2.class;
       case "protobuf_test_messages.editions.TestAllTypesEdition2023":
         return TestMessagesEdition2023.class;
+      case "protobuf_test_messages.edition_unstable.TestAllTypesEditionUnstable":
+        return TestMessagesEditionUnstableProto.class;
       case "protobuf_test_messages.editions.proto3.TestAllTypesProto3":
         return TestMessagesProto3Editions.class;
       case "protobuf_test_messages.editions.proto2.TestAllTypesProto2":

conformance/binary_json_conformance_suite.cc

@@ -33,6 +33,7 @@
 #include "conformance/conformance.pb.h"
 #include "conformance_test.h"
 #include "conformance/test_protos/test_messages_edition2023.pb.h"
+#include "conformance/test_protos/test_messages_edition_unstable.pb.h"
 #include "editions/golden/test_messages_proto2_editions.pb.h"
 #include "editions/golden/test_messages_proto3_editions.pb.h"
 #include "google/protobuf/json/json.h"
@@ -51,6 +52,7 @@ using google::protobuf::Descriptor;
 using google::protobuf::FieldDescriptor;
 using google::protobuf::internal::WireFormatLite;
 using google::protobuf::util::NewTypeResolverForDescriptorPool;
+using protobuf_test_messages::edition_unstable::TestAllTypesEditionUnstable;
 using protobuf_test_messages::editions::TestAllTypesEdition2023;
 using protobuf_test_messages::proto2::TestAllTypesProto2;
 using protobuf_test_messages::proto3::TestAllTypesProto3;
@@ -318,6 +320,7 @@ void BinaryAndJsonConformanceSuite::RunSuiteImpl() {
     BinaryAndJsonConformanceSuiteImpl<TestAllTypesProto2Editions>(
         this, /*run_proto3_tests=*/false);
     RunDelimitedFieldTests();
+    RunUnstableTests();
   }
 }
 
@@ -375,6 +378,22 @@ void BinaryAndJsonConformanceSuite::RunDelimitedFieldTests() {
       R"pb([protobuf_test_messages.editions.delimited_ext] { c: 99 })pb");
 }
 
+void BinaryAndJsonConformanceSuite::RunUnstableTests() {
+  SetTypeUrl(GetTypeUrl(TestAllTypesEditionUnstable::GetDescriptor()));
+
+  RunValidProtobufTest<TestAllTypesEditionUnstable>(
+      absl::StrCat("ValidInt32"), REQUIRED,
+      field(1, WireFormatLite::WIRETYPE_VARINT, varint(99)),
+      R"pb(optional_int32: 99)pb");
+
+  RunValidProtobufTest<TestAllTypesEditionUnstable>(
+      absl::StrCat("ValidMap.Integer"), REQUIRED,
+      len(8,
+          absl::StrCat(field(1, WireFormatLite::WIRETYPE_VARINT, varint(99)),
+                       field(2, WireFormatLite::WIRETYPE_VARINT, varint(87)))),
+      R"pb(map_int32_int32 { key: 99 value: 87 })pb");
+}
+
 void BinaryAndJsonConformanceSuite::RunMessageSetTests() {
   RunValidBinaryProtobufTest<TestAllTypesProto2>(
       absl::StrCat("ValidMessageSetEncoding"), REQUIRED,

conformance/binary_json_conformance_suite.h

@@ -57,6 +57,8 @@ class BinaryAndJsonConformanceSuite : public ConformanceTestSuite {
 
   void RunDelimitedFieldTests();
 
+  void RunUnstableTests();
+
   void RunMessageSetTests();
 
   template <typename MessageType>