Merge tag 'refs/tags/sync-piper' into sync-stage

Author: Adam Cozzette

src/google/protobuf/compiler/js/js_generator.cc

@@ -1408,24 +1408,17 @@ bool HasFieldPresence(const GeneratorOptions& options,
 // were the final one for a given filename.
 class FileDeduplicator {
  public:
-  explicit FileDeduplicator(const GeneratorOptions& options)
-      : error_on_conflict_(options.error_on_name_conflict) {}
+  explicit FileDeduplicator(const GeneratorOptions& options) {}
 
   // params:
   //   filenames: a pair of {short filename, full filename}
   //              (short filename don't have extra information, full filename
   //               contains extra information)
   //   desc: The Descriptor or SCC pointer or EnumDescriptor.
-  //   error: The returned error information.
   bool AddFile(const std::pair<std::string, std::string> filenames,
-               const void* desc, std::string* error) {
+               const void* desc) {
     if (descs_by_shortname_.find(filenames.first) !=
         descs_by_shortname_.end()) {
-      if (error_on_conflict_) {
-        *error = "Name conflict: file name " + filenames.first +
-                 " would be generated by two descriptors";
-        return false;
-      }
       // Change old pointer's actual name to full name.
       auto short_name_desc = descs_by_shortname_[filenames.first];
       allowed_descs_actual_name_[short_name_desc] =
@@ -1443,7 +1436,6 @@ class FileDeduplicator {
   }
 
  private:
-  bool error_on_conflict_;
   // The map that restores all the descs that are using short name as filename.
   std::map<std::string, const void*> descs_by_shortname_;
   // The final actual filename map.
@@ -1537,8 +1529,7 @@ struct DepsGenerator {
 bool GenerateJspbAllowedMap(const GeneratorOptions& options,
                             const std::vector<const FileDescriptor*>& files,
                             std::map<const void*, std::string>* allowed_set,
-                            SCCAnalyzer<DepsGenerator>* analyzer,
-                            std::string* error) {
+                            SCCAnalyzer<DepsGenerator>* analyzer) {
   std::vector<const FileDescriptor*> files_ordered;
   GenerateJspbFileOrder(files, &files_ordered);
 
@@ -1553,15 +1544,15 @@ bool GenerateJspbAllowedMap(const GeneratorOptions& options,
               std::make_pair(
                   GetMessagesFileName(options, analyzer->GetSCC(desc), false),
                   GetMessagesFileName(options, analyzer->GetSCC(desc), true)),
-              analyzer->GetSCC(desc), error)) {
+              analyzer->GetSCC(desc))) {
         return false;
       }
     }
     for (int j = 0; j < files_ordered[i]->enum_type_count(); j++) {
       const EnumDescriptor* desc = files_ordered[i]->enum_type(j);
       if (!dedup.AddFile(std::make_pair(GetEnumFileName(options, desc, false),
                                         GetEnumFileName(options, desc, true)),
-                         desc, error)) {
+                         desc)) {
         return false;
       }
     }
@@ -1580,7 +1571,7 @@ bool GenerateJspbAllowedMap(const GeneratorOptions& options,
               std::make_pair(
                   GetExtensionFileName(options, files_ordered[i], false),
                   GetExtensionFileName(options, files_ordered[i], true)),
-              files_ordered[i], error)) {
+              files_ordered[i])) {
         return false;
       }
     }
@@ -3473,12 +3464,10 @@ bool GeneratorOptions::ParseFromOptions(
         return false;
       }
       testonly = true;
+
     } else if (options[i].first == "error_on_name_conflict") {
-      if (options[i].second != "") {
-        *error = "Unexpected option value for error_on_name_conflict";
-        return false;
-      }
-      error_on_name_conflict = true;
+      GOOGLE_LOG(WARNING) << "Ignoring error_on_name_conflict option, this "
+                             "will be removed in a future release";
     } else if (options[i].first == "output_dir") {
       output_dir = options[i].second;
     } else if (options[i].first == "namespace_prefix") {
@@ -3527,11 +3516,10 @@ bool GeneratorOptions::ParseFromOptions(
 
   if (import_style != kImportClosure &&
       (add_require_for_enums || testonly || !library.empty() ||
-       error_on_name_conflict || extension != ".js" ||
-       one_output_file_per_input_file)) {
+       extension != ".js" || one_output_file_per_input_file)) {
     *error =
-        "The add_require_for_enums, testonly, library, error_on_name_conflict, "
-        "extension, and one_output_file_per_input_file options should only be "
+        "The add_require_for_enums, testonly, library, extension, and "
+        "one_output_file_per_input_file options should only be "
         "used for import_style=closure";
     return false;
   }
@@ -3766,8 +3754,7 @@ bool Generator::GenerateAll(const std::vector<const FileDescriptor*>& files,
     std::set<const Descriptor*> have_printed;
     SCCAnalyzer<DepsGenerator> analyzer;
     std::map<const void*, std::string> allowed_map;
-    if (!GenerateJspbAllowedMap(options, files, &allowed_map, &analyzer,
-                                error)) {
+    if (!GenerateJspbAllowedMap(options, files, &allowed_map, &analyzer)) {
       return false;
     }
 

src/google/protobuf/compiler/js/js_generator.h

@@ -83,7 +83,6 @@ struct GeneratorOptions {
         add_require_for_enums(false),
         testonly(false),
         library(""),
-        error_on_name_conflict(false),
         extension(".js"),
         one_output_file_per_input_file(false),
         annotate_code(false) {}
@@ -119,8 +118,6 @@ struct GeneratorOptions {
   // Create a library with name <name>_lib.js rather than a separate .js file
   // per type?
   std::string library;
-  // Error if there are two types that would generate the same output file?
-  bool error_on_name_conflict;
   // The extension to use for output file names.
   std::string extension;
   // Create a separate output file for each input file?