Sync up the protos with google/protobuf.

Using 239dba535c48b64769cdfdfcb18f771620ccbba9 from their master.

Author: thomasvl

Protos/google/protobuf/descriptor.proto

@@ -45,6 +45,7 @@ option java_package = "com.google.protobuf";
 option java_outer_classname = "DescriptorProtos";
 option csharp_namespace = "Google.Protobuf.Reflection";
 option objc_class_prefix = "GPB";
+option cc_enable_arenas = true;
 
 // descriptor.proto must be optimized for speed because reflection-based
 // algorithms don't work during bootstrapping.
@@ -225,6 +226,26 @@ message EnumDescriptorProto {
   repeated EnumValueDescriptorProto value = 2;
 
   optional EnumOptions options = 3;
+
+  // Range of reserved numeric values. Reserved values may not be used by
+  // entries in the same enum. Reserved ranges may not overlap.
+  //
+  // Note that this is distinct from DescriptorProto.ReservedRange in that it
+  // is inclusive such that it can appropriately represent the entire int32
+  // domain.
+  message EnumReservedRange {
+    optional int32 start = 1; // Inclusive.
+    optional int32 end = 2;   // Inclusive.
+  }
+
+  // Range of reserved numeric values. Reserved numeric values may not be used
+  // by enum values in the same enum declaration. Reserved ranges may not
+  // overlap.
+  repeated EnumReservedRange reserved_range = 4;
+
+  // Reserved enum value names, which may not be reused. A given name may only
+  // be reserved once.
+  repeated string reserved_name = 5;
 }
 
 // Describes a value within an enum.
@@ -361,7 +382,7 @@ message FileOptions {
   optional bool cc_generic_services = 16 [default=false];
   optional bool java_generic_services = 17 [default=false];
   optional bool py_generic_services = 18 [default=false];
-  optional bool php_generic_services = 19 [default=false];
+  optional bool php_generic_services = 42 [default=false];
 
   // Is this file deprecated?
   // Depending on the target platform, this can emit Deprecated annotations
@@ -396,10 +417,12 @@ message FileOptions {
   // determining the namespace.
   optional string php_namespace = 41;
 
-  // The parser stores options it doesn't recognize here. See above.
+  // The parser stores options it doesn't recognize here.
+  // See the documentation for the "Options" section above.
   repeated UninterpretedOption uninterpreted_option = 999;
 
-  // Clients can define custom options in extensions of this message. See above.
+  // Clients can define custom options in extensions of this message.
+  // See the documentation for the "Options" section above.
   extensions 1000 to max;
 
   reserved 38;

Protos/google/protobuf/field_mask.proto

@@ -240,6 +240,12 @@ option go_package = "google.golang.org/genproto/protobuf/field_mask;field_mask";
 //
 // Note that oneof type names ("test_oneof" in this case) cannot be used in
 // paths.
+//
+// ## Field Mask Verification
+//
+// The implementation of the all the API methods, which have any FieldMask type
+// field in the request, should verify the included field paths, and return
+// `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
 message FieldMask {
   // The set of field mask paths.
   repeated string paths = 1;

Protos/google/protobuf/test_messages_proto2.proto

@@ -81,10 +81,10 @@ message TestAllTypesProto2 {
   optional bytes optional_bytes    = 15;
 
   optional NestedMessage                        optional_nested_message  = 18;
-  optional ForeignMessage                       optional_foreign_message = 19;
+  optional ForeignMessageProto2                 optional_foreign_message = 19;
 
   optional NestedEnum                           optional_nested_enum     = 21;
-  optional ForeignEnum                          optional_foreign_enum    = 22;
+  optional ForeignEnumProto2                    optional_foreign_enum    = 22;
 
   optional string optional_string_piece = 24 [ctype=STRING_PIECE];
   optional string optional_cord = 25 [ctype=CORD];
@@ -109,10 +109,10 @@ message TestAllTypesProto2 {
   repeated    bytes repeated_bytes    = 45;
 
   repeated NestedMessage       repeated_nested_message  = 48;
-  repeated ForeignMessage      repeated_foreign_message = 49;
+  repeated ForeignMessageProto2      repeated_foreign_message = 49;
 
   repeated NestedEnum          repeated_nested_enum     = 51;
-  repeated ForeignEnum         repeated_foreign_enum    = 52;
+  repeated ForeignEnumProto2         repeated_foreign_enum    = 52;
 
   repeated string repeated_string_piece = 54 [ctype=STRING_PIECE];
   repeated string repeated_cord = 55 [ctype=CORD];
@@ -134,9 +134,9 @@ message TestAllTypesProto2 {
   map <  string, string>   map_string_string = 69;
   map <  string, bytes>    map_string_bytes = 70;
   map <  string, NestedMessage>  map_string_nested_message = 71;
-  map <  string, ForeignMessage> map_string_foreign_message = 72;
+  map <  string, ForeignMessageProto2> map_string_foreign_message = 72;
   map <  string, NestedEnum>     map_string_nested_enum = 73;
-  map <  string, ForeignEnum>    map_string_foreign_enum = 74;
+  map <  string, ForeignEnumProto2>    map_string_foreign_enum = 74;
 
   oneof oneof_field {
     uint32 oneof_uint32 = 111;
@@ -201,11 +201,11 @@ message TestAllTypesProto2 {
   }
 }
 
-message ForeignMessage {
+message ForeignMessageProto2 {
   optional int32 c = 1;
 }
 
-enum ForeignEnum {
+enum ForeignEnumProto2 {
   FOREIGN_FOO = 0;
   FOREIGN_BAR = 1;
   FOREIGN_BAZ = 2;

Protos/google/protobuf/test_messages_proto3.proto

@@ -215,6 +215,9 @@ message TestAllTypesProto3 {
   int32 field__Name16 = 416;
   int32 field_name17__ = 417;
   int32 Field_name18__ = 418;
+
+  // Reserved for testing unknown fields
+  reserved 501 to 510;
 }
 
 message ForeignMessage {

Protos/google/protobuf/timestamp.proto

@@ -114,7 +114,7 @@ option objc_class_prefix = "GPB";
 // to this format using [`strftime`](https://docs.python.org/2/library/time.html#time.strftime)
 // with the time format spec '%Y-%m-%dT%H:%M:%S.%fZ'. Likewise, in Java, one
 // can use the Joda Time's [`ISODateTimeFormat.dateTime()`](
-// http://joda-time.sourceforge.net/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime())
+// http://www.joda.org/joda-time/apidocs/org/joda/time/format/ISODateTimeFormat.html#dateTime--)
 // to obtain a formatter capable of generating timestamps in this format.
 //
 //

Protos/google/protobuf/unittest_proto3_arena.proto

@@ -187,6 +187,7 @@ message TestUnpackedTypes {
 message NestedTestAllTypes {
   NestedTestAllTypes child = 1;
   TestAllTypes payload = 2;
+  repeated NestedTestAllTypes repeated_child = 3;
 }
 
 // Define these after TestAllTypes to make sure the compiler can handle
@@ -205,4 +206,3 @@ enum ForeignEnum {
 // TestEmptyMessage is used to test behavior of unknown fields.
 message TestEmptyMessage {
 }
-

Reference/google/protobuf/descriptor.pb.swift

@@ -1040,8 +1040,88 @@ struct Google_Protobuf_EnumDescriptorProto: SwiftProtobuf.Message {
   /// Clears the value of `options`. Subsequent reads from it will return its default value.
   mutating func clearOptions() {_storage._options = nil}
 
+  /// Range of reserved numeric values. Reserved numeric values may not be used
+  /// by enum values in the same enum declaration. Reserved ranges may not
+  /// overlap.
+  var reservedRange: [Google_Protobuf_EnumDescriptorProto.EnumReservedRange] {
+    get {return _storage._reservedRange}
+    set {_uniqueStorage()._reservedRange = newValue}
+  }
+
+  /// Reserved enum value names, which may not be reused. A given name may only
+  /// be reserved once.
+  var reservedName: [String] {
+    get {return _storage._reservedName}
+    set {_uniqueStorage()._reservedName = newValue}
+  }
+
   var unknownFields = SwiftProtobuf.UnknownStorage()
 
+  /// Range of reserved numeric values. Reserved values may not be used by
+  /// entries in the same enum. Reserved ranges may not overlap.
+  ///
+  /// Note that this is distinct from DescriptorProto.ReservedRange in that it
+  /// is inclusive such that it can appropriately represent the entire int32
+  /// domain.
+  struct EnumReservedRange: SwiftProtobuf.Message {
+    static let protoMessageName: String = Google_Protobuf_EnumDescriptorProto.protoMessageName + ".EnumReservedRange"
+
+    /// Inclusive.
+    var start: Int32 {
+      get {return _start ?? 0}
+      set {_start = newValue}
+    }
+    /// Returns true if `start` has been explicitly set.
+    var hasStart: Bool {return self._start != nil}
+    /// Clears the value of `start`. Subsequent reads from it will return its default value.
+    mutating func clearStart() {self._start = nil}
+
+    /// Inclusive.
+    var end: Int32 {
+      get {return _end ?? 0}
+      set {_end = newValue}
+    }
+    /// Returns true if `end` has been explicitly set.
+    var hasEnd: Bool {return self._end != nil}
+    /// Clears the value of `end`. Subsequent reads from it will return its default value.
+    mutating func clearEnd() {self._end = nil}
+
+    var unknownFields = SwiftProtobuf.UnknownStorage()
+
+    init() {}
+
+    /// Used by the decoding initializers in the SwiftProtobuf library, not generally
+    /// used directly. `init(serializedData:)`, `init(jsonUTF8Data:)`, and other decoding
+    /// initializers are defined in the SwiftProtobuf library. See the Message and
+    /// Message+*Additions` files.
+    mutating func decodeMessage<D: SwiftProtobuf.Decoder>(decoder: inout D) throws {
+      while let fieldNumber = try decoder.nextFieldNumber() {
+        switch fieldNumber {
+        case 1: try decoder.decodeSingularInt32Field(value: &self._start)
+        case 2: try decoder.decodeSingularInt32Field(value: &self._end)
+        default: break
+        }
+      }
+    }
+
+    /// Used by the encoding methods of the SwiftProtobuf library, not generally
+    /// used directly. `Message.serializedData()`, `Message.jsonUTF8Data()`, and
+    /// other serializer methods are defined in the SwiftProtobuf library. See the
+    /// `Message` and `Message+*Additions` files.
+    func traverse<V: SwiftProtobuf.Visitor>(visitor: inout V) throws {
+      if let v = self._start {
+        try visitor.visitSingularInt32Field(value: v, fieldNumber: 1)
+      }
+      if let v = self._end {
+        try visitor.visitSingularInt32Field(value: v, fieldNumber: 2)
+      }
+      try unknownFields.traverse(visitor: &visitor)
+    }
+
+    fileprivate var _start: Int32? = nil
+    fileprivate var _end: Int32? = nil
+  }
+
   init() {}
 
   public var isInitialized: Bool {
@@ -1064,6 +1144,8 @@ struct Google_Protobuf_EnumDescriptorProto: SwiftProtobuf.Message {
         case 1: try decoder.decodeSingularStringField(value: &_storage._name)
         case 2: try decoder.decodeRepeatedMessageField(value: &_storage._value)
         case 3: try decoder.decodeSingularMessageField(value: &_storage._options)
+        case 4: try decoder.decodeRepeatedMessageField(value: &_storage._reservedRange)
+        case 5: try decoder.decodeRepeatedStringField(value: &_storage._reservedName)
         default: break
         }
       }
@@ -1085,6 +1167,12 @@ struct Google_Protobuf_EnumDescriptorProto: SwiftProtobuf.Message {
       if let v = _storage._options {
         try visitor.visitSingularMessageField(value: v, fieldNumber: 3)
       }
+      if !_storage._reservedRange.isEmpty {
+        try visitor.visitRepeatedMessageField(value: _storage._reservedRange, fieldNumber: 4)
+      }
+      if !_storage._reservedName.isEmpty {
+        try visitor.visitRepeatedStringField(value: _storage._reservedName, fieldNumber: 5)
+      }
     }
     try unknownFields.traverse(visitor: &visitor)
   }
@@ -1598,7 +1686,8 @@ struct Google_Protobuf_FileOptions: SwiftProtobuf.Message, SwiftProtobuf.Extensi
   /// Clears the value of `phpNamespace`. Subsequent reads from it will return its default value.
   mutating func clearPhpNamespace() {_storage._phpNamespace = nil}
 
-  /// The parser stores options it doesn't recognize here. See above.
+  /// The parser stores options it doesn't recognize here.
+  /// See the documentation for the "Options" section above.
   var uninterpretedOption: [Google_Protobuf_UninterpretedOption] {
     get {return _storage._uninterpretedOption}
     set {_uniqueStorage()._uninterpretedOption = newValue}
@@ -1669,7 +1758,6 @@ struct Google_Protobuf_FileOptions: SwiftProtobuf.Message, SwiftProtobuf.Extensi
         case 16: try decoder.decodeSingularBoolField(value: &_storage._ccGenericServices)
         case 17: try decoder.decodeSingularBoolField(value: &_storage._javaGenericServices)
         case 18: try decoder.decodeSingularBoolField(value: &_storage._pyGenericServices)
-        case 19: try decoder.decodeSingularBoolField(value: &_storage._phpGenericServices)
         case 20: try decoder.decodeSingularBoolField(value: &_storage._javaGenerateEqualsAndHash)
         case 23: try decoder.decodeSingularBoolField(value: &_storage._deprecated)
         case 27: try decoder.decodeSingularBoolField(value: &_storage._javaStringCheckUtf8)
@@ -1679,6 +1767,7 @@ struct Google_Protobuf_FileOptions: SwiftProtobuf.Message, SwiftProtobuf.Extensi
         case 39: try decoder.decodeSingularStringField(value: &_storage._swiftPrefix)
         case 40: try decoder.decodeSingularStringField(value: &_storage._phpClassPrefix)
         case 41: try decoder.decodeSingularStringField(value: &_storage._phpNamespace)
+        case 42: try decoder.decodeSingularBoolField(value: &_storage._phpGenericServices)
         case 999: try decoder.decodeRepeatedMessageField(value: &_storage._uninterpretedOption)
         case 1000..<536870912:
           try decoder.decodeExtensionField(values: &_protobuf_extensionFieldValues, messageType: Google_Protobuf_FileOptions.self, fieldNumber: fieldNumber)
@@ -1718,9 +1807,6 @@ struct Google_Protobuf_FileOptions: SwiftProtobuf.Message, SwiftProtobuf.Extensi
       if let v = _storage._pyGenericServices {
         try visitor.visitSingularBoolField(value: v, fieldNumber: 18)
       }
-      if let v = _storage._phpGenericServices {
-        try visitor.visitSingularBoolField(value: v, fieldNumber: 19)
-      }
       if let v = _storage._javaGenerateEqualsAndHash {
         try visitor.visitSingularBoolField(value: v, fieldNumber: 20)
       }
@@ -1748,6 +1834,9 @@ struct Google_Protobuf_FileOptions: SwiftProtobuf.Message, SwiftProtobuf.Extensi
       if let v = _storage._phpNamespace {
         try visitor.visitSingularStringField(value: v, fieldNumber: 41)
       }
+      if let v = _storage._phpGenericServices {
+        try visitor.visitSingularBoolField(value: v, fieldNumber: 42)
+      }
       if !_storage._uninterpretedOption.isEmpty {
         try visitor.visitRepeatedMessageField(value: _storage._uninterpretedOption, fieldNumber: 999)
       }
@@ -3480,12 +3569,16 @@ extension Google_Protobuf_EnumDescriptorProto: SwiftProtobuf._MessageImplementat
     1: .same(proto: "name"),
     2: .same(proto: "value"),
     3: .same(proto: "options"),
+    4: .standard(proto: "reserved_range"),
+    5: .standard(proto: "reserved_name"),
   ]
 
   fileprivate class _StorageClass {
     var _name: String? = nil
     var _value: [Google_Protobuf_EnumValueDescriptorProto] = []
     var _options: Google_Protobuf_EnumOptions? = nil
+    var _reservedRange: [Google_Protobuf_EnumDescriptorProto.EnumReservedRange] = []
+    var _reservedName: [String] = []
 
     static let defaultInstance = _StorageClass()
 
@@ -3495,6 +3588,8 @@ extension Google_Protobuf_EnumDescriptorProto: SwiftProtobuf._MessageImplementat
       _name = source._name
       _value = source._value
       _options = source._options
+      _reservedRange = source._reservedRange
+      _reservedName = source._reservedName
     }
   }
 
@@ -3513,6 +3608,8 @@ extension Google_Protobuf_EnumDescriptorProto: SwiftProtobuf._MessageImplementat
         if _storage._name != other_storage._name {return false}
         if _storage._value != other_storage._value {return false}
         if _storage._options != other_storage._options {return false}
+        if _storage._reservedRange != other_storage._reservedRange {return false}
+        if _storage._reservedName != other_storage._reservedName {return false}
         return true
       }
       if !storagesAreEqual {return false}
@@ -3522,6 +3619,20 @@ extension Google_Protobuf_EnumDescriptorProto: SwiftProtobuf._MessageImplementat
   }
 }
 
+extension Google_Protobuf_EnumDescriptorProto.EnumReservedRange: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
+  static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
+    1: .same(proto: "start"),
+    2: .same(proto: "end"),
+  ]
+
+  func _protobuf_generated_isEqualTo(other: Google_Protobuf_EnumDescriptorProto.EnumReservedRange) -> Bool {
+    if self._start != other._start {return false}
+    if self._end != other._end {return false}
+    if unknownFields != other.unknownFields {return false}
+    return true
+  }
+}
+
 extension Google_Protobuf_EnumValueDescriptorProto: SwiftProtobuf._MessageImplementationBase, SwiftProtobuf._ProtoNameProviding {
   static let _protobuf_nameMap: SwiftProtobuf._NameMap = [
     1: .same(proto: "name"),
@@ -3687,7 +3798,7 @@ extension Google_Protobuf_FileOptions: SwiftProtobuf._MessageImplementationBase,
     16: .standard(proto: "cc_generic_services"),
     17: .standard(proto: "java_generic_services"),
     18: .standard(proto: "py_generic_services"),
-    19: .standard(proto: "php_generic_services"),
+    42: .standard(proto: "php_generic_services"),
     23: .same(proto: "deprecated"),
     31: .standard(proto: "cc_enable_arenas"),
     36: .standard(proto: "objc_class_prefix"),

Reference/google/protobuf/field_mask.pb.swift

@@ -249,6 +249,12 @@ fileprivate struct _GeneratedWithProtocGenSwiftVersion: SwiftProtobuf.ProtobufAP
 ///
 /// Note that oneof type names ("test_oneof" in this case) cannot be used in
 /// paths.
+///
+/// ## Field Mask Verification
+///
+/// The implementation of the all the API methods, which have any FieldMask type
+/// field in the request, should verify the included field paths, and return
+/// `INVALID_ARGUMENT` error if any path is duplicated or unmappable.
 struct Google_Protobuf_FieldMask: SwiftProtobuf.Message {
   static let protoMessageName: String = _protobuf_package + ".FieldMask"