Skip to content

Commit 424444f

Browse files
mrabiciumrabiciu
committed
make regenerate
1 parent 2dea3b1 commit 424444f

12 files changed

+453
-163
lines changed

‎FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3904,7 +3904,7 @@ extension SwiftProtoTesting_Fuzz_Message: SwiftProtobuf.Message, SwiftProtobuf._
39043904
try { if let v = _storage._singularBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) {
39053905
try visitor.visitSingularBytesField(value: v, fieldNumber: 15)
39063906
} }()
3907-
try { if let v = _storage._singularEnum ?? (alwaysVisitPrimitiveFields ? .zero : nil) {
3907+
try { if let v = _storage._singularEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Fuzz_AnEnum.zero : nil) {
39083908
try visitor.visitSingularEnumField(value: v, fieldNumber: 16)
39093909
} }()
39103910
try { if let v = _storage._singularGroup {

‎Sources/Conformance/test_messages_proto2.pb.swift‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2768,10 +2768,10 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message,
27682768
try { if let v = _storage._optionalForeignMessage {
27692769
try visitor.visitSingularMessageField(value: v, fieldNumber: 19)
27702770
} }()
2771-
try { if let v = _storage._optionalNestedEnum ?? (alwaysVisitPrimitiveFields ? .foo : nil) {
2771+
try { if let v = _storage._optionalNestedEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum.foo : nil) {
27722772
try visitor.visitSingularEnumField(value: v, fieldNumber: 21)
27732773
} }()
2774-
try { if let v = _storage._optionalForeignEnum ?? (alwaysVisitPrimitiveFields ? .foreignFoo : nil) {
2774+
try { if let v = _storage._optionalForeignEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_ForeignEnumProto2.foreignFoo : nil) {
27752775
try visitor.visitSingularEnumField(value: v, fieldNumber: 22)
27762776
} }()
27772777
try { if let v = _storage._optionalStringPiece ?? (alwaysVisitPrimitiveFields ? String() : nil) {
@@ -4081,10 +4081,10 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf.
40814081
try { if let v = _storage._requiredForeignMessage {
40824082
try visitor.visitSingularMessageField(value: v, fieldNumber: 19)
40834083
} }()
4084-
try { if let v = _storage._requiredNestedEnum ?? (alwaysVisitPrimitiveFields ? .foo : nil) {
4084+
try { if let v = _storage._requiredNestedEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedEnum.foo : nil) {
40854085
try visitor.visitSingularEnumField(value: v, fieldNumber: 21)
40864086
} }()
4087-
try { if let v = _storage._requiredForeignEnum ?? (alwaysVisitPrimitiveFields ? .foreignFoo : nil) {
4087+
try { if let v = _storage._requiredForeignEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_ForeignEnumProto2.foreignFoo : nil) {
40884088
try visitor.visitSingularEnumField(value: v, fieldNumber: 22)
40894089
} }()
40904090
try { if let v = _storage._requiredStringPiece ?? (alwaysVisitPrimitiveFields ? String() : nil) {

‎Sources/SwiftProtobuf/descriptor.pb.swift‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3074,7 +3074,7 @@ extension Google_Protobuf_FileDescriptorProto: Message, _MessageImplementationBa
30743074
try { if let v = self._syntax ?? (alwaysVisitPrimitiveFields ? String() : nil) {
30753075
try visitor.visitSingularStringField(value: v, fieldNumber: 12)
30763076
} }()
3077-
try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
3077+
try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) {
30783078
try visitor.visitSingularEnumField(value: v, fieldNumber: 14)
30793079
} }()
30803080
try unknownFields.traverse(visitor: &visitor)
@@ -3392,7 +3392,7 @@ extension Google_Protobuf_ExtensionRangeOptions: Message, _MessageImplementation
33923392
if !self.declaration.isEmpty || alwaysVisitPrimitiveFields {
33933393
try visitor.visitRepeatedMessageField(value: self.declaration, fieldNumber: 2)
33943394
}
3395-
try { if let v = self._verification ?? (alwaysVisitPrimitiveFields ? .unverified : nil) {
3395+
try { if let v = self._verification ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_ExtensionRangeOptions.VerificationState.unverified : nil) {
33963396
try visitor.visitSingularEnumField(value: v, fieldNumber: 3)
33973397
} }()
33983398
try { if let v = self._features {
@@ -3542,10 +3542,10 @@ extension Google_Protobuf_FieldDescriptorProto: Message, _MessageImplementationB
35423542
try { if let v = self._number ?? (alwaysVisitPrimitiveFields ? 0 : nil) {
35433543
try visitor.visitSingularInt32Field(value: v, fieldNumber: 3)
35443544
} }()
3545-
try { if let v = self._label ?? (alwaysVisitPrimitiveFields ? .optional : nil) {
3545+
try { if let v = self._label ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldDescriptorProto.Label.optional : nil) {
35463546
try visitor.visitSingularEnumField(value: v, fieldNumber: 4)
35473547
} }()
3548-
try { if let v = self._type ?? (alwaysVisitPrimitiveFields ? .double : nil) {
3548+
try { if let v = self._type ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldDescriptorProto.TypeEnum.double : nil) {
35493549
try visitor.visitSingularEnumField(value: v, fieldNumber: 5)
35503550
} }()
35513551
try { if let v = self._typeName ?? (alwaysVisitPrimitiveFields ? String() : nil) {
@@ -4104,7 +4104,7 @@ extension Google_Protobuf_FileOptions: Message, _MessageImplementationBase, _Pro
41044104
try { if let v = _storage._javaOuterClassname ?? (alwaysVisitPrimitiveFields ? String() : nil) {
41054105
try visitor.visitSingularStringField(value: v, fieldNumber: 8)
41064106
} }()
4107-
try { if let v = _storage._optimizeFor ?? (alwaysVisitPrimitiveFields ? .speed : nil) {
4107+
try { if let v = _storage._optimizeFor ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FileOptions.OptimizeMode.speed : nil) {
41084108
try visitor.visitSingularEnumField(value: v, fieldNumber: 9)
41094109
} }()
41104110
try { if let v = _storage._javaMultipleFiles ?? (alwaysVisitPrimitiveFields ? false : nil) {
@@ -4404,7 +4404,7 @@ extension Google_Protobuf_FieldOptions: Message, _MessageImplementationBase, _Pr
44044404
// allocates stack space for every if/case branch local when no optimizations
44054405
// are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
44064406
// https://github.com/apple/swift-protobuf/issues/1182
4407-
try { if let v = _storage._ctype ?? (alwaysVisitPrimitiveFields ? .string : nil) {
4407+
try { if let v = _storage._ctype ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldOptions.CType.string : nil) {
44084408
try visitor.visitSingularEnumField(value: v, fieldNumber: 1)
44094409
} }()
44104410
try { if let v = _storage._packed ?? (alwaysVisitPrimitiveFields ? false : nil) {
@@ -4416,7 +4416,7 @@ extension Google_Protobuf_FieldOptions: Message, _MessageImplementationBase, _Pr
44164416
try { if let v = _storage._lazy ?? (alwaysVisitPrimitiveFields ? false : nil) {
44174417
try visitor.visitSingularBoolField(value: v, fieldNumber: 5)
44184418
} }()
4419-
try { if let v = _storage._jstype ?? (alwaysVisitPrimitiveFields ? .jsNormal : nil) {
4419+
try { if let v = _storage._jstype ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldOptions.JSType.jsNormal : nil) {
44204420
try visitor.visitSingularEnumField(value: v, fieldNumber: 6)
44214421
} }()
44224422
try { if let v = _storage._weak ?? (alwaysVisitPrimitiveFields ? false : nil) {
@@ -4428,7 +4428,7 @@ extension Google_Protobuf_FieldOptions: Message, _MessageImplementationBase, _Pr
44284428
try { if let v = _storage._debugRedact ?? (alwaysVisitPrimitiveFields ? false : nil) {
44294429
try visitor.visitSingularBoolField(value: v, fieldNumber: 16)
44304430
} }()
4431-
try { if let v = _storage._retention ?? (alwaysVisitPrimitiveFields ? .retentionUnknown : nil) {
4431+
try { if let v = _storage._retention ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldOptions.OptionRetention.retentionUnknown : nil) {
44324432
try visitor.visitSingularEnumField(value: v, fieldNumber: 17)
44334433
} }()
44344434
if !_storage._targets.isEmpty || alwaysVisitPrimitiveFields {
@@ -4544,7 +4544,7 @@ extension Google_Protobuf_FieldOptions.EditionDefault: Message, _MessageImplemen
45444544
try { if let v = self._value ?? (alwaysVisitPrimitiveFields ? String() : nil) {
45454545
try visitor.visitSingularStringField(value: v, fieldNumber: 2)
45464546
} }()
4547-
try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
4547+
try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) {
45484548
try visitor.visitSingularEnumField(value: v, fieldNumber: 3)
45494549
} }()
45504550
try unknownFields.traverse(visitor: &visitor)
@@ -4852,7 +4852,7 @@ extension Google_Protobuf_MethodOptions: Message, _MessageImplementationBase, _P
48524852
try { if let v = self._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) {
48534853
try visitor.visitSingularBoolField(value: v, fieldNumber: 33)
48544854
} }()
4855-
try { if let v = self._idempotencyLevel ?? (alwaysVisitPrimitiveFields ? .idempotencyUnknown : nil) {
4855+
try { if let v = self._idempotencyLevel ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_MethodOptions.IdempotencyLevel.idempotencyUnknown : nil) {
48564856
try visitor.visitSingularEnumField(value: v, fieldNumber: 34)
48574857
} }()
48584858
try { if let v = self._features {
@@ -5052,22 +5052,22 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot
50525052
// allocates stack space for every if/case branch local when no optimizations
50535053
// are enabled. https://github.com/apple/swift-protobuf/issues/1034 and
50545054
// https://github.com/apple/swift-protobuf/issues/1182
5055-
try { if let v = self._fieldPresence ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5055+
try { if let v = self._fieldPresence ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.FieldPresence.unknown : nil) {
50565056
try visitor.visitSingularEnumField(value: v, fieldNumber: 1)
50575057
} }()
5058-
try { if let v = self._enumType ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5058+
try { if let v = self._enumType ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.EnumType.unknown : nil) {
50595059
try visitor.visitSingularEnumField(value: v, fieldNumber: 2)
50605060
} }()
5061-
try { if let v = self._repeatedFieldEncoding ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5061+
try { if let v = self._repeatedFieldEncoding ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.RepeatedFieldEncoding.unknown : nil) {
50625062
try visitor.visitSingularEnumField(value: v, fieldNumber: 3)
50635063
} }()
5064-
try { if let v = self._utf8Validation ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5064+
try { if let v = self._utf8Validation ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.Utf8Validation.unknown : nil) {
50655065
try visitor.visitSingularEnumField(value: v, fieldNumber: 4)
50665066
} }()
5067-
try { if let v = self._messageEncoding ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5067+
try { if let v = self._messageEncoding ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.MessageEncoding.unknown : nil) {
50685068
try visitor.visitSingularEnumField(value: v, fieldNumber: 5)
50695069
} }()
5070-
try { if let v = self._jsonFormat ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5070+
try { if let v = self._jsonFormat ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.JsonFormat.unknown : nil) {
50715071
try visitor.visitSingularEnumField(value: v, fieldNumber: 6)
50725072
} }()
50735073
try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 1000, end: 10000)
@@ -5172,10 +5172,10 @@ extension Google_Protobuf_FeatureSetDefaults: Message, _MessageImplementationBas
51725172
if !self.defaults.isEmpty || alwaysVisitPrimitiveFields {
51735173
try visitor.visitRepeatedMessageField(value: self.defaults, fieldNumber: 1)
51745174
}
5175-
try { if let v = self._minimumEdition ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5175+
try { if let v = self._minimumEdition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) {
51765176
try visitor.visitSingularEnumField(value: v, fieldNumber: 4)
51775177
} }()
5178-
try { if let v = self._maximumEdition ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5178+
try { if let v = self._maximumEdition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) {
51795179
try visitor.visitSingularEnumField(value: v, fieldNumber: 5)
51805180
} }()
51815181
try unknownFields.traverse(visitor: &visitor)
@@ -5224,7 +5224,7 @@ extension Google_Protobuf_FeatureSetDefaults.FeatureSetEditionDefault: Message,
52245224
try { if let v = self._features {
52255225
try visitor.visitSingularMessageField(value: v, fieldNumber: 2)
52265226
} }()
5227-
try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? .unknown : nil) {
5227+
try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) {
52285228
try visitor.visitSingularEnumField(value: v, fieldNumber: 3)
52295229
} }()
52305230
try unknownFields.traverse(visitor: &visitor)
@@ -5409,7 +5409,7 @@ extension Google_Protobuf_GeneratedCodeInfo.Annotation: Message, _MessageImpleme
54095409
try { if let v = self._end ?? (alwaysVisitPrimitiveFields ? 0 : nil) {
54105410
try visitor.visitSingularInt32Field(value: v, fieldNumber: 4)
54115411
} }()
5412-
try { if let v = self._semantic ?? (alwaysVisitPrimitiveFields ? .none : nil) {
5412+
try { if let v = self._semantic ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_GeneratedCodeInfo.Annotation.Semantic.none : nil) {
54135413
try visitor.visitSingularEnumField(value: v, fieldNumber: 5)
54145414
} }()
54155415
try unknownFields.traverse(visitor: &visitor)

‎Sources/protoc-gen-swift/MessageFieldGenerator.swift‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class MessageFieldGenerator: FieldGeneratorBase, FieldGenerator {
3636

3737
private var isMap: Bool {return fieldDescriptor.isMap}
3838
private var isPacked: Bool { return fieldDescriptor.isPacked }
39+
private var isEnum: Bool { return fieldDescriptor.enumType != nil }
3940

4041
// Note: this could still be a map (since those are repeated message fields
4142
private var isRepeated: Bool {return fieldDescriptor.isRepeated}
@@ -208,7 +209,7 @@ class MessageFieldGenerator: FieldGeneratorBase, FieldGenerator {
208209
if !isGroupOrMessage, fieldDescriptor.file.syntax == .proto2 {
209210
// Under proto2 all primitives have presence but
210211
// we want include primitives if alwaysVisitPrimitiveFields is true
211-
conditional = "let v = \(storedProperty) ?? (alwaysVisitPrimitiveFields ? \(swiftDefaultValue) : nil)"
212+
conditional = "let v = \(storedProperty) ?? (alwaysVisitPrimitiveFields ? \(isEnum ? swiftType : "")\(swiftDefaultValue) : nil)"
212213
} else {
213214
conditional = "let v = \(storedProperty)"
214215
}

‎Tests/SwiftProtobufTests/fuzz_testing.pb.swift‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3904,7 +3904,7 @@ extension SwiftProtoTesting_Fuzz_Message: SwiftProtobuf.Message, SwiftProtobuf._
39043904
try { if let v = _storage._singularBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) {
39053905
try visitor.visitSingularBytesField(value: v, fieldNumber: 15)
39063906
} }()
3907-
try { if let v = _storage._singularEnum ?? (alwaysVisitPrimitiveFields ? .zero : nil) {
3907+
try { if let v = _storage._singularEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Fuzz_AnEnum.zero : nil) {
39083908
try visitor.visitSingularEnumField(value: v, fieldNumber: 16)
39093909
} }()
39103910
try { if let v = _storage._singularGroup {

0 commit comments

Comments
 (0)