Internal change

PiperOrigin-RevId: 850074730

Author: protobuf-github-bot

src/google/protobuf/compiler/BUILD.bazel

@@ -71,6 +71,7 @@ cc_library(
         "//src/google/protobuf/io:io_win32",
         "//src/google/protobuf/io:tokenizer",
         "@abseil-cpp//absl/base",
+        "@abseil-cpp//absl/base:core_headers",
         "@abseil-cpp//absl/cleanup",
         "@abseil-cpp//absl/container:flat_hash_map",
         "@abseil-cpp//absl/container:flat_hash_set",
@@ -552,9 +553,11 @@ cc_test(
         "//src/google/protobuf:test_util2",
         "//src/google/protobuf/compiler:retention",
         "//src/google/protobuf/io",
+        "//src/google/protobuf/io:tokenizer",
         "//src/google/protobuf/stubs",
         "//src/google/protobuf/testing",
         "//src/google/protobuf/testing:file",
+        "@abseil-cpp//absl/base:core_headers",
         "@abseil-cpp//absl/container:flat_hash_map",
         "@abseil-cpp//absl/log:absl_check",
         "@abseil-cpp//absl/memory",

src/google/protobuf/compiler/parser.cc

@@ -13,6 +13,8 @@
 
 #include "google/protobuf/compiler/parser.h"
 
+#include <cassert>
+#include <climits>
 #include <cstddef>
 #include <cstdint>
 #include <limits>
@@ -21,6 +23,7 @@
 #include <utility>
 #include <vector>
 
+#include "absl/base/attributes.h"
 #include "absl/cleanup/cleanup.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/container/flat_hash_set.h"
@@ -75,10 +78,29 @@ const TypeNameMap& GetTypeNameTable() {
   return *table;
 }
 
-const TypeNameMap& GetUnstableVarintTypeNameTable() {
+const TypeNameMap& GetFixedFirstTypeNameTable() {
   static auto* table = new auto([]() {
     TypeNameMap result;
 
+    result["double"] = FieldDescriptorProto::TYPE_DOUBLE;
+    result["float"] = FieldDescriptorProto::TYPE_FLOAT;
+    result["uint64"] = FieldDescriptorProto::TYPE_UINT64;
+    result["fixed64"] = FieldDescriptorProto::TYPE_FIXED64;
+    result["fixed32"] = FieldDescriptorProto::TYPE_FIXED32;
+    result["bool"] = FieldDescriptorProto::TYPE_BOOL;
+    result["string"] = FieldDescriptorProto::TYPE_STRING;
+    result["group"] = FieldDescriptorProto::TYPE_GROUP;
+
+    result["bytes"] = FieldDescriptorProto::TYPE_BYTES;
+    result["uint32"] = FieldDescriptorProto::TYPE_UINT32;
+    result["sfixed32"] = FieldDescriptorProto::TYPE_SFIXED32;
+    result["sfixed64"] = FieldDescriptorProto::TYPE_SFIXED64;
+    result["int32"] = FieldDescriptorProto::TYPE_INT32;
+    result["int64"] = FieldDescriptorProto::TYPE_INT64;
+    result["sint32"] = FieldDescriptorProto::TYPE_SINT32;
+    result["sint64"] = FieldDescriptorProto::TYPE_SINT64;
+
+    // New types added to preserve legacy behavior.
     result["varint32"] = FieldDescriptorProto::TYPE_INT32;
     result["varint64"] = FieldDescriptorProto::TYPE_INT64;
     result["uvarint32"] = FieldDescriptorProto::TYPE_UINT32;
@@ -468,7 +490,7 @@ void Parser::LocationRecorder::AttachComments(
   if (!trailing->empty()) {
     location_->mutable_trailing_comments()->swap(*trailing);
   }
-  for (int i = 0; i < detached_comments->size(); ++i) {
+  for (size_t i = 0; i < detached_comments->size(); ++i) {
     location_->add_leading_detached_comments()->swap((*detached_comments)[i]);
   }
   detached_comments->clear();
@@ -1315,7 +1337,7 @@ bool Parser::ParseDefaultAssignment(
       DO(ConsumeInteger64(max_value, &value,
                           "Expected integer for field default value."));
       // And stringify it again.
-      default_value->append(absl::StrCat(value));
+      absl::StrAppend(default_value, value);
       break;
     }
 
@@ -1338,7 +1360,7 @@ bool Parser::ParseDefaultAssignment(
       DO(ConsumeInteger64(max_value, &value,
                           "Expected integer for field default value."));
       // And stringify it again.
-      default_value->append(absl::StrCat(value));
+      absl::StrAppend(default_value, value);
       break;
     }
 
@@ -2427,9 +2449,16 @@ bool Parser::ParseLabel(FieldDescriptorProto::Label* label,
   return true;
 }
 
+bool Parser::ShouldUseFixedFirstType() const {
+  return syntax_identifier_ == "editions" &&
+         edition_ == Edition::EDITION_UNSTABLE;
+}
+
 bool Parser::ParseType(FieldDescriptorProto::Type* type,
                        std::string* type_name) {
-  const auto& type_names_table = GetTypeNameTable();
+  const auto& type_names_table = ShouldUseFixedFirstType()
+                                     ? GetFixedFirstTypeNameTable()
+                                     : GetTypeNameTable();
   auto iter = type_names_table.find(input_->current().text);
   if (iter != type_names_table.end()) {
     if (syntax_identifier_ == "editions" &&
@@ -2442,17 +2471,6 @@ bool Parser::ParseType(FieldDescriptorProto::Type* type,
     *type = iter->second;
     input_->Next();
   } else {
-    // EDITION_UNSTABLE supports new numeric types.
-    if (syntax_identifier_ == "editions" &&
-        edition_ == Edition::EDITION_UNSTABLE) {
-      const auto& type_names_table = GetUnstableVarintTypeNameTable();
-      auto iter = type_names_table.find(input_->current().text);
-      if (iter != type_names_table.end()) {
-        *type = iter->second;
-        input_->Next();
-        return true;
-      }
-    }
     DO(ParseUserDefinedType(type_name));
   }
   return true;

src/google/protobuf/compiler/parser.h

@@ -18,6 +18,7 @@
 #include <string>
 #include <type_traits>
 #include <utility>
+#include <vector>
 
 #include "absl/container/flat_hash_map.h"
 #include "absl/strings/string_view.h"
@@ -124,6 +125,8 @@ class PROTOBUF_EXPORT Parser final {
   // ending after the closing '}' is encountered and consumed, or at EOF.
   void SkipRestOfBlock();
 
+  bool ShouldUseFixedFirstType() const;
+
   // -----------------------------------------------------------------
   // Single-token consuming helpers
   //
@@ -372,10 +375,10 @@ class PROTOBUF_EXPORT Parser final {
   bool ParseMessageStatement(DescriptorProto* message,
                              const LocationRecorder& message_location,
                              const FileDescriptorProto* containing_file);
-  bool ParseEnumStatement(EnumDescriptorProto* message,
+  bool ParseEnumStatement(EnumDescriptorProto* enum_type,
                           const LocationRecorder& enum_location,
                           const FileDescriptorProto* containing_file);
-  bool ParseServiceStatement(ServiceDescriptorProto* message,
+  bool ParseServiceStatement(ServiceDescriptorProto* service,
                              const LocationRecorder& service_location,
                              const FileDescriptorProto* containing_file);
 
@@ -422,13 +425,13 @@ class PROTOBUF_EXPORT Parser final {
   bool ParseReservedIdentifier(std::string* name, ErrorMaker error_message);
   bool ParseReservedNumbers(DescriptorProto* message,
                             const LocationRecorder& parent_location);
-  bool ParseReserved(EnumDescriptorProto* message,
-                     const LocationRecorder& message_location);
-  bool ParseReservedNames(EnumDescriptorProto* message,
+  bool ParseReserved(EnumDescriptorProto* proto,
+                     const LocationRecorder& enum_location);
+  bool ParseReservedNames(EnumDescriptorProto* proto,
                           const LocationRecorder& parent_location);
-  bool ParseReservedIdentifiers(EnumDescriptorProto* message,
+  bool ParseReservedIdentifiers(EnumDescriptorProto* proto,
                                 const LocationRecorder& parent_location);
-  bool ParseReservedNumbers(EnumDescriptorProto* message,
+  bool ParseReservedNumbers(EnumDescriptorProto* proto,
                             const LocationRecorder& parent_location);
 
   // Parse an "extend" declaration.  (See also comments for

src/google/protobuf/compiler/parser_unittest.cc

@@ -13,31 +13,36 @@
 
 #include <algorithm>
 #include <cmath>
+#include <cstddef>
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
+#include "google/protobuf/testing/file.h"
 #include "google/protobuf/any.pb.h"
 #include "google/protobuf/descriptor.pb.h"
 #include <gmock/gmock.h>
 #include "google/protobuf/testing/googletest.h"
 #include <gtest/gtest.h>
+#include "absl/base/macros.h"
 #include "absl/container/flat_hash_map.h"
 #include "absl/log/absl_check.h"
 #include "absl/memory/memory.h"
+#include "absl/strings/match.h"
 #include "absl/strings/str_cat.h"
 #include "absl/strings/str_join.h"
+#include "absl/strings/string_view.h"
 #include "absl/strings/substitute.h"
-#include "google/protobuf/compiler/retention.h"
 #include "google/protobuf/descriptor.h"
+#include "google/protobuf/io/tokenizer.h"
+#include "google/protobuf/io/zero_copy_stream_impl_lite.h"
 #include "google/protobuf/test_util2.h"
 #include "google/protobuf/text_format.h"
 #include "google/protobuf/unittest.pb.h"
 #include "google/protobuf/unittest_custom_options.pb.h"
 #include "google/protobuf/unittest_import.pb.h"
 #include "google/protobuf/unittest_import_public.pb.h"
-#include "google/protobuf/wire_format.h"
 
 
 // Must be included last.
@@ -232,8 +237,8 @@ TEST_F(ParserTest, WarnIfSyntaxIdentifierOmitted) {
   FileDescriptorProto file;
   CaptureTestStderr();
   EXPECT_TRUE(parser_->Parse(input_.get(), &file));
-  EXPECT_TRUE(GetCapturedTestStderr().find("No edition or syntax specified") !=
-              std::string::npos);
+  EXPECT_TRUE(absl::StrContains(GetCapturedTestStderr(),
+                                "No edition or syntax specified"));
 }
 
 TEST_F(ParserTest, RegressionNestedOpenBraceDoNotStackOverflow) {
@@ -3356,7 +3361,7 @@ TEST_F(ParseDescriptorDebugTest, TestCommentsInDebugString) {
     const std::string debug_string =
         descriptor->DebugStringWithOptions(debug_string_options);
 
-    for (int i = 0; i < ABSL_ARRAYSIZE(expected_comments); ++i) {
+    for (size_t i = 0; i < ABSL_ARRAYSIZE(expected_comments); ++i) {
       std::string::size_type found_pos =
           debug_string.find(expected_comments[i]);
       EXPECT_TRUE(found_pos != std::string::npos)
@@ -3391,9 +3396,9 @@ TEST_F(ParseDescriptorDebugTest, TestMaps) {
   // Make sure the debug string uses map syntax and does not have the auto
   // generated entry.
   std::string debug_string = file->DebugString();
-  EXPECT_TRUE(debug_string.find("map<") != std::string::npos);
-  EXPECT_TRUE(debug_string.find("option map_entry") == std::string::npos);
-  EXPECT_TRUE(debug_string.find("MapEntry") == std::string::npos);
+  EXPECT_TRUE(absl::StrContains(debug_string, "map<"));
+  EXPECT_TRUE(!absl::StrContains(debug_string, "option map_entry"));
+  EXPECT_TRUE(!absl::StrContains(debug_string, "MapEntry"));
 
   // Make sure the descriptor debug string is parsable.
   FileDescriptorProto parsed;