Continue cleaning up after the GLOBALS experiment.

src/google/protobuf/compiler/cpp/message.cc

@@ -1394,9 +1394,7 @@ void MessageGenerator::GenerateMapEntryClassDefinition(io::Printer* p) {
         }},
        {"decl_annotate", [&] { GenerateAnnotationDecl(p); }},
        {"alias_parse_table_type",
-        [&] { parse_function_generator_->GenerateAliasParseTableType(p); }},
-       {"parse_decls",
-        [&] { parse_function_generator_->GenerateDataDecls(p); }}},
+        [&] { parse_function_generator_->GenerateAliasParseTableType(p); }}},
       R"cc(
         class $unused $$Msg$ final
             : public $pbi$::MapEntry<$key_cpp$, $val_cpp$,
@@ -1431,7 +1429,6 @@ void MessageGenerator::GenerateMapEntryClassDefinition(io::Printer* p) {
           $alias_parse_table_type$;
           static constexpr ParseTableT_ InternalGenerateParseTable_(
               const $pbi$::ClassData* $nonnull$ class_data);
-          $parse_decls$;
           $decl_annotate$;
 
           const $pbi$::ClassData* $nonnull$ GetClassData() const PROTOBUF_FINAL;
@@ -2080,7 +2077,6 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
         }},
        {"alias_parse_table_type",
         [&] { parse_function_generator_->GenerateAliasParseTableType(p); }},
-       {"decl_data", [&] { parse_function_generator_->GenerateDataDecls(p); }},
        {"post_loop_handler",
         [&] {
           if (!NeedsPostLoopHandler(descriptor_, options_)) return;
@@ -2250,7 +2246,6 @@ void MessageGenerator::GenerateClassDefinition(io::Printer* p) {
           $alias_parse_table_type$;
           static constexpr ParseTableT_ InternalGenerateParseTable_(
               const $pbi$::ClassData* $nonnull$ class_data);
-          $decl_data$;
           $post_loop_handler$;
 
           friend class $pb$::MessageLite;

src/google/protobuf/compiler/cpp/parse_function_generator.cc

@@ -151,14 +151,6 @@ void ParseFunctionGenerator::GenerateAliasParseTableType(io::Printer* p) {
       )cc");
 }
 
-void ParseFunctionGenerator::GenerateDataDecls(io::Printer* p) {
-  auto v = p->WithVars(variables_);
-  // TODO: Remove this once we remove TcParser::GetTable.
-  p->Emit(R"cc(
-    friend class $pbi$::TcParser;
-  )cc");
-}
-
 static std::string TcParseFunctionName(internal::TcParseFunction func) {
 #define PROTOBUF_TC_PARSE_FUNCTION_X(value) #value,
   static constexpr absl::string_view kNames[] = {
@@ -260,7 +252,7 @@ void ParseFunctionGenerator::GenerateParseTableHelperDefinition(
                                                  options_)}},
                 R"cc(
 #ifdef PROTOBUF_PREFETCH_PARSE_TABLE
-                  ::_pbi::TcParser::GetTable<$hot_type$>(),  // to_prefetch
+                  ::_pbi::MessageTraits<$hot_type$>::tc_table(),  // to_prefetch
 #endif  // PROTOBUF_PREFETCH_PARSE_TABLE)cc");
           }}},
         // clang-format off

src/google/protobuf/compiler/cpp/parse_function_generator.h

@@ -76,9 +76,6 @@ class ParseFunctionGenerator {
   // Emit alias parse table type.
   void GenerateAliasParseTableType(io::Printer* printer);
 
-  // Emits class-level data member declarations to `printer`:
-  void GenerateDataDecls(io::Printer* printer);
-
   // Emits the helper function definition to `printer`:
   void GenerateParseTableHelperDefinition(io::Printer* printer);
 

src/google/protobuf/edition_message_unittest.cc

@@ -57,25 +57,13 @@ namespace internal {
 namespace {
 
 
-template <typename T>
-static const TcParseTableBase* GetTableIfAvailable(...) {
-  return nullptr;
-}
-
-template <typename T>
-static const TcParseTableBase* GetTableIfAvailable(
-    decltype(TcParser::GetTable<T>())) {
-  return TcParser::GetTable<T>();
-}
-
 TEST(EditionMessageTest,
      TestRegressionInlinedStringAuxIdxMismatchOnFastParser) {
   using Proto = UNITTEST::InlinedStringIdxRegressionProto;
 
-  auto* table = GetTableIfAvailable<Proto>(nullptr);
-  // Only test when TDP is on, and we have these fields inlined.
-  if (table != nullptr &&
-      table->fast_entry(1)->target() == TcParser::FastBiS1) {
+  auto* table = MessageTraits<Proto>::tc_table();
+  // Only test when we have these fields inlined.
+  if (table->fast_entry(1)->target() == TcParser::FastBiS1) {
     // optional string str1 = 1;
     // The aux_idx points to the inlined_string_idx and not the actual aux_idx.
     EXPECT_EQ(table->fast_entry(1)->bits.aux_idx(), 1);

src/google/protobuf/generated_message_tctable_impl.h

@@ -376,17 +376,6 @@ enum class TcParseFunction : uint8_t { kNone, PROTOBUF_TC_PARSE_FUNCTION_LIST };
 // TcParser implements most of the parsing logic for tailcall tables.
 class PROTOBUF_EXPORT TcParser final {
  public:
-  template <typename T>
-#ifndef PROTOBUF_MESSAGE_GLOBALS
-  static constexpr auto GetTable() -> decltype(&T::_table_.header) {
-    return &T::_table_.header;
-  }
-#else
-  static const TcParseTableBase* GetTable() {
-    return MessageTraits<T>::tc_table();
-  }
-#endif
-
   static PROTOBUF_ALWAYS_INLINE const char* ParseMessage(
       MessageLite* msg, const char* ptr, ParseContext* ctx,
       const TcParseTableBase* tc_table) {

src/google/protobuf/message_unittest_legacy_apis.inc

@@ -79,18 +79,7 @@ TEST(MESSAGE_TEST_NAME, LegacyAddMethodsOnRepeatedStringField) {
 }
 
 
-namespace {
-template <typename T>
-static const internal::TcParseTableBase* GetTableIfAvailable(...) {
-  return nullptr;
-}
 
-template <typename T>
-static const internal::TcParseTableBase* GetTableIfAvailable(
-    decltype(internal::TcParser::GetTable<T>())) {
-  return internal::TcParser::GetTable<T>();
-}
-}  // namespace
 
 }  // namespace protobuf
 }  // namespace google