Enable edition 2024 in upb generators

PiperOrigin-RevId: 825760735

Author: mkruskal-google

upb/test/BUILD

@@ -90,6 +90,10 @@ proto_library(
     name = "editions_test_proto",
     testonly = 1,
     srcs = ["editions_test.proto"],
+    option_deps = [
+        ":custom_options_proto",
+        ":custom_options_unlinked_proto",
+    ],
 )
 
 upb_c_proto_library(
@@ -192,11 +196,18 @@ cc_test(
     srcs = ["editions_test.cc"],
     copts = UPB_DEFAULT_CPPOPTS,
     deps = [
+        ":custom_options_upb_c_proto",
+        ":custom_options_upb_minitable_proto",
+        ":custom_options_upb_proto_reflection",
         ":editions_test_upb_c_proto",
         ":editions_test_upb_proto_reflection",
         "//upb/base",
         "//upb/mem",
+        "//upb/message",
+        "//upb/mini_table",
+        "//upb/port",
         "//upb/reflection",
+        "//upb/reflection:descriptor_upb_proto",
         "@googletest//:gtest",
         "@googletest//:gtest_main",
     ],
@@ -305,6 +316,38 @@ proto_library(
     deps = [":empty_srcs_3_proto"],
 )
 
+proto_library(
+    name = "custom_options_unlinked_proto",
+    testonly = 1,
+    srcs = ["custom_options_unlinked.proto"],
+    deps = ["//:descriptor_proto"],
+)
+
+proto_library(
+    name = "custom_options_proto",
+    testonly = 1,
+    srcs = ["custom_options.proto"],
+    deps = ["//:descriptor_proto"],
+)
+
+upb_c_proto_library(
+    name = "custom_options_upb_c_proto",
+    testonly = 1,
+    deps = [":custom_options_proto"],
+)
+
+upb_minitable_proto_library(
+    name = "custom_options_upb_minitable_proto",
+    testonly = 1,
+    deps = [":custom_options_proto"],
+)
+
+upb_proto_reflection_library(
+    name = "custom_options_upb_proto_reflection",
+    testonly = 1,
+    deps = [":custom_options_proto"],
+)
+
 upb_minitable_proto_library(
     name = "test_import_empty_srcs_upb_minitable_proto",
     testonly = 1,

upb/test/custom_options.proto

@@ -0,0 +1,9 @@
+edition = "2024";
+
+package upb;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.MessageOptions {
+  int32 message_opt = 7739036;
+}

upb/test/custom_options_unlinked.proto

@@ -0,0 +1,9 @@
+edition = "2024";
+
+package upb;
+
+import "google/protobuf/descriptor.proto";
+
+extend google.protobuf.MessageOptions {
+  int32 message_opt_unlinked = 7739037;
+}

upb/test/editions_test.cc

@@ -5,10 +5,16 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
+#include <stdint.h>
+
 #include <gtest/gtest.h>
 #include "upb/base/descriptor_constants.h"
+#include "upb/base/upcast.h"
 #include "upb/mem/arena.hpp"
+#include "upb/message/message.h"
+#include "upb/port/def.inc"
 #include "upb/reflection/def.hpp"
+#include "upb/reflection/descriptor_bootstrap.h"
 #include "upb/test/editions_test.upb.h"
 #include "upb/test/editions_test.upbdefs.h"
 
@@ -54,6 +60,18 @@ TEST(EditionsTest, PackedField) {
   ASSERT_FALSE(f.packed());
 }
 
+TEST(EditionsTest, ImportOptionUnlinked) {
+  // Test that unlinked option dependencies show up in unknown fields.  These
+  // are optional dependencies that may or may not be present in the binary.
+
+  upb::Arena arena;
+  upb::DefPool defpool;
+  upb::MessageDefPtr md(upb_test_2023_EditionsMessage_getmsgdef(defpool.ptr()));
+  const google_protobuf_MessageOptions* options = md.options();
+
+  EXPECT_TRUE(upb_Message_HasUnknown(UPB_UPCAST(options)));
+}
+
 TEST(EditionsTest, ConstructProto) {
   // Doesn't do anything except construct the proto. This just verifies that
   // the generated code compiles successfully.

upb/test/editions_test.proto

@@ -5,11 +5,19 @@
 // license that can be found in the LICENSE file or at
 // https://developers.google.com/open-source/licenses/bsd
 
-edition = "2023";
+edition = "2024";
 
 package upb.test_2023;
 
+import option "upb/test/custom_options.proto";
+import option "upb/test/custom_options_unlinked.proto";
+
+option features.enforce_naming_style = STYLE_LEGACY;
+
 message EditionsMessage {
+  option (upb.message_opt) = 87;
+  option (upb.message_opt_unlinked) = 9;
+
   int32 plain_field = 1;
   int32 implicit_presence_field = 2 [features.field_presence = IMPLICIT];
   int32 required_field = 3 [features.field_presence = LEGACY_REQUIRED];

upb_generator/bootstrap_compiler.bzl

@@ -28,6 +28,7 @@ _bootstrap_visibility = [
     "//third_party/upb/github:__pkg__",
     "//upb_generator:__subpackages__",
     "//upb/reflection:__pkg__",
+    "//upb/test:__pkg__",
     "//upb:__pkg__",  # For the amalgamations.
     "//python/dist:__pkg__",  # For the Python source package.
     "//:__pkg__",  # For protoc

upb_generator/c/generator.cc

@@ -1357,7 +1357,7 @@ class CGenerator : public google::protobuf::compiler::CodeGenerator {
     return google::protobuf::Edition::EDITION_PROTO2;
   }
   google::protobuf::Edition GetMaximumEdition() const override {
-    return google::protobuf::Edition::EDITION_2023;
+    return google::protobuf::Edition::EDITION_2024;
   }
 };
 

upb_generator/minitable/main.cc

@@ -115,7 +115,7 @@ class MiniTableGenerator : public google::protobuf::compiler::CodeGenerator {
     return google::protobuf::Edition::EDITION_PROTO2;
   }
   google::protobuf::Edition GetMaximumEdition() const override {
-    return google::protobuf::Edition::EDITION_2023;
+    return google::protobuf::Edition::EDITION_2024;
   }
 };
 

upb_generator/reflection/generator.cc

@@ -84,7 +84,7 @@ class ReflectionGenerator : public google::protobuf::compiler::CodeGenerator {
     return google::protobuf::Edition::EDITION_PROTO2;
   }
   google::protobuf::Edition GetMaximumEdition() const override {
-    return google::protobuf::Edition::EDITION_2023;
+    return google::protobuf::Edition::EDITION_2024;
   }
 };