Add conformance test for edition unstable

PiperOrigin-RevId: 837221234

Author: Rachel Goldfinger

conformance/BUILD

@@ -138,6 +138,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",
@@ -166,6 +167,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",
@@ -249,6 +251,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",
@@ -440,6 +443,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",
@@ -472,6 +476,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",
     ],
@@ -492,6 +497,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",
     ],
@@ -511,6 +517,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.
@@ -572,6 +579,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",
     ],
 )
@@ -587,6 +595,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",
     ],

conformance/ruby/BUILD

@@ -25,6 +25,12 @@ internal_ruby_proto_library(
     srcs = [":copied_test_messages_edition2023_proto"],
 )
 
+internal_ruby_proto_library(
+    name = "test_messages_edition_unstable_ruby_proto",
+    testonly = True,
+    srcs = [":copied_test_messages_edition_unstable_proto"],
+)
+
 rb_binary(
     name = "conformance_ruby",
     testonly = True,
@@ -34,6 +40,7 @@ rb_binary(
     deps = [
         ":conformance_ruby_proto",
         ":test_messages_edition2023_ruby_proto",
+        ":test_messages_edition_unstable_ruby_proto",
         "//ruby:conformance_editions_test_ruby_proto",
         "//ruby:conformance_test_ruby_proto",
         "//ruby:protobuf",
@@ -55,3 +62,10 @@ internal_copy_files(
     srcs = ["//conformance/test_protos:test_messages_edition2023.proto"],
     strip_prefix = "conformance/test_protos",
 )
+
+internal_copy_files(
+    name = "copied_test_messages_edition_unstable_proto",
+    testonly = True,
+    srcs = ["//conformance/test_protos:test_messages_edition_unstable.proto"],
+    strip_prefix = "conformance/test_protos",
+)

conformance/test_protos/BUILD

@@ -14,13 +14,21 @@ package(
     default_visibility = ["//conformance:__subpackages__"],
 )
 
-exports_files(["test_messages_edition2023.proto"])
+exports_files([
+    "test_messages_edition2023.proto",
+    "test_messages_edition_unstable.proto",
+])
 
 internal_csharp_proto_library(
     name = "test_messages_edition2023_csharp_proto",
     srcs = ["test_messages_edition2023.proto"],
 )
 
+internal_csharp_proto_library(
+    name = "test_messages_edition_unstable_csharp_proto",
+    srcs = ["test_messages_edition_unstable.proto"],
+)
+
 # Aliases for older monolithic conformance test protos defined elsewhere.
 alias(
     name = "test_messages_proto2_editions_proto",
@@ -52,28 +60,60 @@ proto_library(
     visibility = ["//visibility:public"],
 )
 
+proto_library(
+    name = "test_messages_edition_unstable_proto",
+    srcs = ["test_messages_edition_unstable.proto"],
+    visibility = ["//visibility:public"],
+)
+
 java_lite_proto_library(
     name = "test_messages_edition2023_java_proto_lite",
     deps = [":test_messages_edition2023_proto"],
 )
 
+java_lite_proto_library(
+    name = "test_messages_edition_unstable_java_proto_lite",
+    deps = [":test_messages_edition_unstable_proto"],
+)
+
 java_proto_library(
     name = "test_messages_edition2023_java_proto",
     deps = [":test_messages_edition2023_proto"],
 )
 
+java_proto_library(
+    name = "test_messages_edition_unstable_java_proto",
+    deps = [":test_messages_edition_unstable_proto"],
+)
+
 cc_proto_library(
     name = "test_messages_edition2023_cc_proto",
     deps = [":test_messages_edition2023_proto"],
 )
 
+cc_proto_library(
+    name = "test_messages_edition_unstable_cc_proto",
+    deps = [":test_messages_edition_unstable_proto"],
+)
+
 internal_py_proto_library(
     name = "test_messages_edition2023_py_pb2",
     srcs = [":test_messages_edition2023.proto"],
     srcs_version = "PY2AND3",
 )
 
+internal_py_proto_library(
+    name = "test_messages_edition_unstable_py_pb2",
+    srcs = [":test_messages_edition_unstable.proto"],
+    srcs_version = "PY2AND3",
+)
+
 internal_objc_proto_library(
     name = "test_messages_edition2023_objc_proto",
     srcs = [":test_messages_edition2023.proto"],
 )
+
+internal_objc_proto_library(
+    name = "test_messages_edition_unstable_objc_proto",
+    srcs = [":test_messages_edition_unstable.proto"],
+)

conformance/test_protos/test_messages_edition_unstable.proto

@@ -0,0 +1,12 @@
+// Protocol Buffers - Google's data interchange format
+// Copyright 2024 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
+
+edition = "UNSTABLE";
+
+package protobuf_test_messages.edition_unstable;
+
+option java_package = "com.google.protobuf_test_messages.edition_unstable";

java/core/src/main/java/com/google/protobuf/Descriptors.java

@@ -120,7 +120,8 @@ static FeatureSet getEditionDefaults(Edition edition) {
               + javaEditionDefaults.getMinimumEdition()
               + "!");
     }
-    if (edition.getNumber() > javaEditionDefaults.getMaximumEdition().getNumber()) {
+    if (edition.getNumber() > javaEditionDefaults.getMaximumEdition().getNumber()
+        && edition != Edition.EDITION_UNSTABLE) {
       throw new IllegalArgumentException(
           "Edition "
               + edition

python/google/protobuf/descriptor_pool.py

@@ -738,7 +738,10 @@ def _CreateDefaultFeatures(self, edition):
               ),
           )
       )
-    if edition > self._edition_defaults.maximum_edition:
+    if (
+        edition > self._edition_defaults.maximum_edition
+        and edition != descriptor_pb2.EDITION_UNSTABLE
+    ):
       raise TypeError(
           'Edition %s is later than the maximum supported edition %s!'
           % (

src/google/protobuf/compiler/code_generator.cc

@@ -106,7 +106,10 @@ void GeneratorContext::GetCompilerVersion(Version* version) const {
 bool CanSkipEditionCheck(absl::string_view filename) {
   return absl::StartsWith(filename, "google/protobuf/") ||
          absl::StartsWith(filename, "upb/") ||
-         absl::StartsWith(filename, "com/google/protobuf/");
+         absl::StartsWith(filename, "com/google/protobuf/") ||
+         absl::StartsWith(filename, "conformance/test_protos") ||
+         // TODO: Remove this once internal_copy_files is removed.
+         absl::StartsWith(filename, "conformance/ruby");
 }
 
 }  // namespace compiler

upb/reflection/file_def.c

@@ -220,7 +220,7 @@ const UPB_DESC(FeatureSet*)
                          upb_FileDef_EditionName(min));
     return NULL;
   }
-  if (edition > max) {
+  if (edition > max && edition != UPB_DESC(EDITION_UNSTABLE)) {
     _upb_DefBuilder_Errf(ctx,
                          "Edition %s is later than the maximum edition %s "
                          "given in the defaults",