Ban import weak and weak field option in edition 2024 in protoc (parser and c++ runtime).

Also expands edition-gating of `import option` to descriptor.cc.

PiperOrigin-RevId: 761993162

Author: zhangskz

src/google/protobuf/compiler/command_line_interface_unittest.cc

@@ -675,6 +675,7 @@ TEST_F(CommandLineInterfaceTest, MultipleInputs_UnusedImport_DescriptorSetIn) {
 
   file_descriptor_proto = file_descriptor_set.add_file();
   file_descriptor_proto->set_name("import_custom_unknown_options.proto");
+  file_descriptor_proto->set_edition(google::protobuf::Edition::EDITION_2024);
   file_descriptor_proto->add_option_dependency("custom_options.proto");
   // Add custom message option to unknown field. This custom option is
   // not known in generated pool, thus option will be in unknown fields.
@@ -688,7 +689,8 @@ TEST_F(CommandLineInterfaceTest, MultipleInputs_UnusedImport_DescriptorSetIn) {
 
   Run("protocol_compiler --test_out=$tmpdir --plug_out=$tmpdir "
       "--descriptor_set_in=$tmpdir/foo.bin "
-      "import_custom_unknown_options.proto");
+      "import_custom_unknown_options.proto "
+      "--experimental_editions");
 
   // TODO: Fix this test. This test case only happens when
   // CommandLineInterface::Run() is used instead of invoke protoc combined

src/google/protobuf/compiler/parser.cc

@@ -2508,13 +2508,13 @@ bool Parser::ParseImport(RepeatedPtrField<std::string>* dependency,
   DO(Consume("import"));
   std::string import_file;
   if (LookingAt("option")) {
+    if (edition_ < Edition::EDITION_2024) {
+      RecordError("option import is not supported before edition 2024.");
+    }
     LocationRecorder option_import_location(
         root_location, FileDescriptorProto::kOptionDependencyFieldNumber,
         option_dependency->size());
     option_import_location.StartAt(import_start);
-    if (edition_ < Edition::EDITION_2024) {
-      RecordError("option import is not supported before edition 2024.");
-    }
     DO(Consume("option"));
     DO(ConsumeString(&import_file,
                      "Expected a string naming the file to import."));
@@ -2542,6 +2542,11 @@ bool Parser::ParseImport(RepeatedPtrField<std::string>* dependency,
     DO(Consume("public"));
     *public_dependency->Add() = dependency->size();
   } else if (LookingAt("weak")) {
+    if (edition_ >= Edition::EDITION_2024) {
+      RecordError(
+          "weak import is not supported in edition 2024 and above. Consider "
+          "using option import instead.");
+    }
     LocationRecorder weak_location(
         root_location, FileDescriptorProto::kWeakDependencyFieldNumber,
         weak_dependency->size());

src/google/protobuf/compiler/parser_unittest.cc

@@ -2203,6 +2203,16 @@ TEST_F(ParseErrorTest, OptionImportBefore2024) {
       "2:15: option import is not supported before edition 2024.\n");
 }
 
+TEST_F(ParseErrorTest, WeakImportAfter2024) {
+  ExpectHasErrors(
+      R"schema(
+        edition = "2024";
+        import weak "foo.proto";
+      )schema",
+      "2:15: weak import is not supported in edition 2024 and above. Consider "
+      "using option import instead.\n");
+}
+
 // ===================================================================
 // Test that errors detected by DescriptorPool correctly report line and
 // column numbers.  We have one test for every call to RecordLocation() in
@@ -3553,25 +3563,44 @@ class SourceInfoTest : public ParserTest {
 
 TEST_F(SourceInfoTest, BasicFileDecls) {
   EXPECT_TRUE(
-      Parse("$a$edition = \"2024\";$i$\n"
+      Parse("$a$edition = \"2023\";$i$\n"
             "$b$package foo.bar;$c$\n"
             "$d$import \"baz.proto\";$e$\n"
             "$f$import\"qux.proto\";$h$\n"
             "$j$import $k$public$l$ \"bar.proto\";$m$\n"
             "$n$import $o$weak$p$ \"bar.proto\";$q$\n"
-            "$r$import option \"bar.proto\";$s$\n"
             "\n"
             "// comment ignored\n"));
 
-  EXPECT_TRUE(HasSpan('a', 's', file_));
+  EXPECT_TRUE(HasSpan('a', 'q', file_));
   EXPECT_TRUE(HasSpan('b', 'c', file_, "package"));
   EXPECT_TRUE(HasSpan('d', 'e', file_, "dependency", 0));
   EXPECT_TRUE(HasSpan('f', 'h', file_, "dependency", 1));
   EXPECT_TRUE(HasSpan('j', 'm', file_, "dependency", 2));
   EXPECT_TRUE(HasSpan('k', 'l', file_, "public_dependency", 0));
   EXPECT_TRUE(HasSpan('n', 'q', file_, "dependency", 3));
   EXPECT_TRUE(HasSpan('o', 'p', file_, "weak_dependency", 0));
-  EXPECT_TRUE(HasSpan('r', 's', file_, "option_dependency", 0));
+  EXPECT_TRUE(HasSpan('a', 'i', file_, "syntax"));
+}
+
+TEST_F(SourceInfoTest, BasicFileDecls_Edition2024) {
+  EXPECT_TRUE(
+      Parse("$a$edition = \"2024\";$i$\n"
+            "$b$package foo.bar;$c$\n"
+            "$d$import \"baz.proto\";$e$\n"
+            "$f$import\"qux.proto\";$h$\n"
+            "$j$import $k$public$l$ \"bar.proto\";$m$\n"
+            "$n$import option \"bar.proto\";$o$\n"
+            "\n"
+            "// comment ignored\n"));
+
+  EXPECT_TRUE(HasSpan('a', 'o', file_));
+  EXPECT_TRUE(HasSpan('b', 'c', file_, "package"));
+  EXPECT_TRUE(HasSpan('d', 'e', file_, "dependency", 0));
+  EXPECT_TRUE(HasSpan('f', 'h', file_, "dependency", 1));
+  EXPECT_TRUE(HasSpan('j', 'm', file_, "dependency", 2));
+  EXPECT_TRUE(HasSpan('k', 'l', file_, "public_dependency", 0));
+  EXPECT_TRUE(HasSpan('n', 'o', file_, "option_dependency", 0));
   EXPECT_TRUE(HasSpan('a', 'i', file_, "syntax"));
 }
 

src/google/protobuf/descriptor.cc

@@ -5389,7 +5389,7 @@ Symbol DescriptorBuilder::FindSymbol(const absl::string_view name,
       if (dep != nullptr && IsInPackage(dep, name)) return result;
     }
     for (const auto* dep : option_dependencies_) {
-      // Note:  An dependency may be nullptr if it was not found or had errors.
+      // Note:  A dependency may be nullptr if it was not found or had errors.
       if (dep != nullptr && IsInPackage(dep, name)) return result;
     }
   }
@@ -8489,6 +8489,12 @@ void DescriptorBuilder::ValidateOptions(const FileDescriptor* file,
     ValidateProto3(file, proto);
   }
 
+  if (file->edition() < Edition::EDITION_2024 &&
+      file->option_dependency_count() > 0) {
+    AddError("option", proto, DescriptorPool::ErrorCollector::IMPORT,
+             "option imports are not supported before edition 2024.");
+  }
+
   if (file->edition() >= Edition::EDITION_2024) {
     if (file->options().has_java_multiple_files()) {
       AddError(file->name(), proto, DescriptorPool::ErrorCollector::OPTION_NAME,
@@ -8497,6 +8503,10 @@ void DescriptorBuilder::ValidateOptions(const FileDescriptor* file,
                " `nest_in_file_class = NO` (equivalent to "
                "`java_multiple_files = true`).");
     }
+    if (file->weak_dependency_count() > 0) {
+      AddError("weak", proto, DescriptorPool::ErrorCollector::IMPORT,
+               "weak imports are not allowed under edition 2024 and beyond.");
+    }
   }
 }