Remove descriptor_legacy usage from C++ runtime

PiperOrigin-RevId: 588915020
protocolbuffers · Dec 7, 2023 · 17f4f91 · 17f4f91
1 parent 43f92cb
commit 17f4f91
Show file tree

Hide file tree

Showing 13 changed files with 110 additions and 165 deletions.
diff --git a/conformance/BUILD.bazel b/conformance/BUILD.bazel
@@ -144,7 +144,6 @@ cc_library(
     includes = ["."],
     deps = [
         ":conformance_cc_proto",
-        "//src/google/protobuf:descriptor_legacy",
         "//src/google/protobuf/util:differencer",
         "//src/google/protobuf/util:json_util",
         "//src/google/protobuf/util:type_resolver_util",

diff --git a/conformance/conformance_test.cc b/conformance/conformance_test.cc
@@ -24,7 +24,6 @@
 #include "absl/strings/string_view.h"
 #include "conformance/conformance.pb.h"
 #include "conformance/conformance.pb.h"
-#include "google/protobuf/descriptor_legacy.h"
 #include "google/protobuf/message.h"
 #include "google/protobuf/text_format.h"
 
@@ -143,13 +142,12 @@ ConformanceTestSuite::ConformanceRequestSetting::NewTestMessage() const {
 
 std::string
 ConformanceTestSuite::ConformanceRequestSetting::GetSyntaxIdentifier() const {
-  switch (FileDescriptorLegacy(prototype_message_.GetDescriptor()->file())
-              .syntax()) {
-    case FileDescriptorLegacy::Syntax::SYNTAX_PROTO3:
+  switch (prototype_message_.GetDescriptor()->file()->edition()) {
+    case Edition::EDITION_PROTO3:
       return "Proto3";
-    case FileDescriptorLegacy::Syntax::SYNTAX_PROTO2:
+    case Edition::EDITION_PROTO2:
       return "Proto2";
-    case FileDescriptorLegacy::Syntax::SYNTAX_EDITIONS: {
+    default: {
       std::string id = "Editions";
       if (prototype_message_.GetDescriptor()->name() == "TestAllTypesProto2") {
         absl::StrAppend(&id, "_Proto2");
@@ -159,8 +157,6 @@ ConformanceTestSuite::ConformanceRequestSetting::GetSyntaxIdentifier() const {
       }
       return id;
     }
-    default:
-      return "Unknown";
   }
 }
 

diff --git a/src/google/protobuf/BUILD.bazel b/src/google/protobuf/BUILD.bazel
@@ -486,7 +486,6 @@ cc_library(
         "descriptor.h",
         "descriptor.pb.h",
         "descriptor_database.h",
-        "descriptor_legacy.h",
         "descriptor_visitor.h",
         "dynamic_message.h",
         "feature_resolver.h",