From 8b366c4465b5f3f8ebf5277fd6fa8724aa1433eb Mon Sep 17 00:00:00 2001 From: "max.rabiciuc" Date: Sun, 11 Feb 2024 11:43:54 -0800 Subject: [PATCH] make regenerate --- .../Sources/FuzzCommon/fuzz_testing.pb.swift | 47 +- .../Conformance/test_messages_proto2.pb.swift | 220 ++- Sources/SwiftProtobuf/descriptor.pb.swift | 220 ++- .../plugin.pb.swift | 26 +- .../SwiftProtobufTests/fuzz_testing.pb.swift | 47 +- Tests/SwiftProtobufTests/unittest.pb.swift | 252 ++-- .../unittest_import.pb.swift | 3 +- .../unittest_import_public.pb.swift | 3 +- .../SwiftProtobufTests/unittest_mset.pb.swift | 13 +- .../unittest_preserve_unknown_enum2.pb.swift | 2 +- ...unittest_swift_all_required_types.pb.swift | 100 +- .../unittest_swift_deprecated.pb.swift | 8 +- .../unittest_swift_deprecated_file.pb.swift | 3 +- ...ttest_swift_enum_optional_default.pb.swift | 6 +- .../unittest_swift_extension.pb.swift | 12 +- .../unittest_swift_extension2.pb.swift | 6 +- .../unittest_swift_extension3.pb.swift | 6 +- .../unittest_swift_extension4.pb.swift | 6 +- .../unittest_swift_fieldorder.pb.swift | 15 +- .../unittest_swift_groups.pb.swift | 25 +- .../unittest_swift_naming.pb.swift | 1203 +++++++---------- ...ittest_swift_naming_number_prefix.pb.swift | 3 +- ...unittest_swift_oneof_all_required.pb.swift | 11 +- .../unittest_swift_oneof_merging.pb.swift | 7 +- .../unittest_swift_reserved.pb.swift | 17 +- .../unittest_swift_runtime_proto2.pb.swift | 55 +- 26 files changed, 1001 insertions(+), 1315 deletions(-) diff --git a/FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift b/FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift index 3a044c4f0..97c3c5a56 100644 --- a/FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift +++ b/FuzzTesting/Sources/FuzzCommon/fuzz_testing.pb.swift @@ -3859,52 +3859,52 @@ extension SwiftProtoTesting_Fuzz_Message: SwiftProtobuf.Message, SwiftProtobuf._ // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._singularInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._singularInt64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._singularUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._singularUint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._singularSint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._singularSint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._singularFixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._singularFixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._singularSfixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._singularSfixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._singularFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._singularDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._singularBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._singularBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._singularString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._singularString { try visitor.visitSingularStringField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._singularBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = _storage._singularBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 15) } }() - try { if let v = _storage._singularEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Fuzz_AnEnum.zero : nil) { + try { if let v = _storage._singularEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 16) } }() try { if let v = _storage._singularGroup { @@ -5002,12 +5002,11 @@ extension SwiftProtoTesting_Fuzz_Message.SingularGroup: SwiftProtobuf.Message, S } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 18) } }() try unknownFields.traverse(visitor: &visitor) @@ -5039,12 +5038,11 @@ extension SwiftProtoTesting_Fuzz_Message.RepeatedGroup: SwiftProtobuf.Message, S } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 48) } }() try unknownFields.traverse(visitor: &visitor) @@ -5076,12 +5074,11 @@ extension SwiftProtoTesting_Fuzz_Message.OneofGroup: SwiftProtobuf.Message, Swif } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 78) } }() try unknownFields.traverse(visitor: &visitor) @@ -5138,12 +5135,11 @@ extension SwiftProtoTesting_Fuzz_SingularGroup_ext: SwiftProtobuf.Message, Swift } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1018) } }() try unknownFields.traverse(visitor: &visitor) @@ -5175,12 +5171,11 @@ extension SwiftProtoTesting_Fuzz_RepeatedGroup_ext: SwiftProtobuf.Message, Swift } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1048) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Sources/Conformance/test_messages_proto2.pb.swift b/Sources/Conformance/test_messages_proto2.pb.swift index 61a55be04..b65462071 100644 --- a/Sources/Conformance/test_messages_proto2.pb.swift +++ b/Sources/Conformance/test_messages_proto2.pb.swift @@ -2717,49 +2717,49 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message, // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._optionalInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._optionalInt64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._optionalUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._optionalUint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._optionalSint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._optionalSint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._optionalFixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._optionalFixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._optionalSfixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._optionalSfixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._optionalFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._optionalDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._optionalBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._optionalBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._optionalString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._optionalString { try visitor.visitSingularStringField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._optionalBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = _storage._optionalBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 15) } }() try { if let v = _storage._optionalNestedMessage { @@ -2768,16 +2768,16 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message, try { if let v = _storage._optionalForeignMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 19) } }() - try { if let v = _storage._optionalNestedEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedEnum.foo : nil) { + try { if let v = _storage._optionalNestedEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 21) } }() - try { if let v = _storage._optionalForeignEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_ForeignEnumProto2.foreignFoo : nil) { + try { if let v = _storage._optionalForeignEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 22) } }() - try { if let v = _storage._optionalStringPiece ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._optionalStringPiece { try visitor.visitSingularStringField(value: v, fieldNumber: 24) } }() - try { if let v = _storage._optionalCord ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._optionalCord { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() try { if let v = _storage._recursiveMessage { @@ -3030,103 +3030,103 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2: SwiftProtobuf.Message, try { if let v = _storage._data { try visitor.visitSingularGroupField(value: v, fieldNumber: 201) } }() - try { if let v = _storage._defaultInt32 ?? (alwaysVisitPrimitiveFields ? -123456789 : nil) { + try { if let v = _storage._defaultInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 241) } }() - try { if let v = _storage._defaultInt64 ?? (alwaysVisitPrimitiveFields ? -9123456789123456789 : nil) { + try { if let v = _storage._defaultInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 242) } }() - try { if let v = _storage._defaultUint32 ?? (alwaysVisitPrimitiveFields ? 2123456789 : nil) { + try { if let v = _storage._defaultUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 243) } }() - try { if let v = _storage._defaultUint64 ?? (alwaysVisitPrimitiveFields ? 10123456789123456789 : nil) { + try { if let v = _storage._defaultUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 244) } }() - try { if let v = _storage._defaultSint32 ?? (alwaysVisitPrimitiveFields ? -123456789 : nil) { + try { if let v = _storage._defaultSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 245) } }() - try { if let v = _storage._defaultSint64 ?? (alwaysVisitPrimitiveFields ? -9123456789123456789 : nil) { + try { if let v = _storage._defaultSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 246) } }() - try { if let v = _storage._defaultFixed32 ?? (alwaysVisitPrimitiveFields ? 2123456789 : nil) { + try { if let v = _storage._defaultFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 247) } }() - try { if let v = _storage._defaultFixed64 ?? (alwaysVisitPrimitiveFields ? 10123456789123456789 : nil) { + try { if let v = _storage._defaultFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 248) } }() - try { if let v = _storage._defaultSfixed32 ?? (alwaysVisitPrimitiveFields ? -123456789 : nil) { + try { if let v = _storage._defaultSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 249) } }() - try { if let v = _storage._defaultSfixed64 ?? (alwaysVisitPrimitiveFields ? -9123456789123456789 : nil) { + try { if let v = _storage._defaultSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 250) } }() - try { if let v = _storage._defaultFloat ?? (alwaysVisitPrimitiveFields ? 9e+09 : nil) { + try { if let v = _storage._defaultFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 251) } }() - try { if let v = _storage._defaultDouble ?? (alwaysVisitPrimitiveFields ? 7e+22 : nil) { + try { if let v = _storage._defaultDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 252) } }() - try { if let v = _storage._defaultBool ?? (alwaysVisitPrimitiveFields ? true : nil) { + try { if let v = _storage._defaultBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 253) } }() - try { if let v = _storage._defaultString ?? (alwaysVisitPrimitiveFields ? "Rosebud" : nil) { + try { if let v = _storage._defaultString { try visitor.visitSingularStringField(value: v, fieldNumber: 254) } }() - try { if let v = _storage._defaultBytes ?? (alwaysVisitPrimitiveFields ? Data([106, 111, 115, 104, 117, 97]) : nil) { + try { if let v = _storage._defaultBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 255) } }() - try { if let v = _storage._fieldname1 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldname1 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 401) } }() - try { if let v = _storage._fieldName2 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName2 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 402) } }() - try { if let v = _storage._fieldName3 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName3 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 403) } }() - try { if let v = _storage._field_Name4_ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._field_Name4_ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 404) } }() - try { if let v = _storage._field0Name5 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._field0Name5 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 405) } }() - try { if let v = _storage._field0Name6 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._field0Name6 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 406) } }() - try { if let v = _storage._fieldName7 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName7 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 407) } }() - try { if let v = _storage._fieldName8 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName8 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 408) } }() - try { if let v = _storage._fieldName9 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName9 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 409) } }() - try { if let v = _storage._fieldName10 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName10 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 410) } }() - try { if let v = _storage._fieldName11 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName11 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 411) } }() - try { if let v = _storage._fieldName12 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName12 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 412) } }() - try { if let v = _storage.__FieldName13 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage.__FieldName13 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 413) } }() - try { if let v = _storage.__FieldName14 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage.__FieldName14 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 414) } }() - try { if let v = _storage._field_Name15 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._field_Name15 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 415) } }() - try { if let v = _storage._field_Name16 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._field_Name16 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 416) } }() - try { if let v = _storage._fieldName17__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName17__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 417) } }() - try { if let v = _storage._fieldName18__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fieldName18__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 418) } }() } @@ -3334,13 +3334,12 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.NestedMessage: SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try { if let v = _storage._corecursive { @@ -3387,15 +3386,14 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.DataMessage: SwiftProto } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 202) } }() - try { if let v = self._groupUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 203) } }() try unknownFields.traverse(visitor: &visitor) @@ -3453,12 +3451,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._str ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._str { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() try unknownFields.traverse(visitor: &visitor) @@ -3490,12 +3487,11 @@ extension ProtobufTestMessages_Proto2_TestAllTypesProto2.MessageSetCorrectExtens } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._i ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._i { try visitor.visitSingularInt32Field(value: v, fieldNumber: 9) } }() try unknownFields.traverse(visitor: &visitor) @@ -3527,12 +3523,11 @@ extension ProtobufTestMessages_Proto2_ForeignMessageProto2: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -3579,10 +3574,10 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Messa // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._optionalInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._optionalInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1001) } }() - try { if let v = self._optionalString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._optionalString { try visitor.visitSingularStringField(value: v, fieldNumber: 1002) } }() try { if let v = self._nestedMessage { @@ -3591,7 +3586,7 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes: SwiftProtobuf.Messa try { if let v = self._optionalGroup { try visitor.visitSingularGroupField(value: v, fieldNumber: 1004) } }() - try { if let v = self._optionalBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._optionalBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 1006) } }() if !self.repeatedInt32.isEmpty || alwaysVisitPrimitiveFields { @@ -3631,12 +3626,11 @@ extension ProtobufTestMessages_Proto2_UnknownToTestAllTypes.OptionalGroup: Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -3713,12 +3707,11 @@ extension ProtobufTestMessages_Proto2_OneStringProto2: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._data ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._data { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -3759,10 +3752,10 @@ extension ProtobufTestMessages_Proto2_ProtoWithKeywords: SwiftProtobuf.Message, // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._inline ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._inline { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._concept ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._concept { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() if !self.requires.isEmpty || alwaysVisitPrimitiveFields { @@ -4024,55 +4017,54 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf. } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._requiredInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._requiredInt64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._requiredUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._requiredUint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._requiredSint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._requiredSint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._requiredFixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._requiredFixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._requiredSfixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._requiredSfixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._requiredFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._requiredDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._requiredBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._requiredBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._requiredString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._requiredString { try visitor.visitSingularStringField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._requiredBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = _storage._requiredBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 15) } }() try { if let v = _storage._requiredNestedMessage { @@ -4081,16 +4073,16 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf. try { if let v = _storage._requiredForeignMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 19) } }() - try { if let v = _storage._requiredNestedEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedEnum.foo : nil) { + try { if let v = _storage._requiredNestedEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 21) } }() - try { if let v = _storage._requiredForeignEnum ?? (alwaysVisitPrimitiveFields ? ProtobufTestMessages_Proto2_ForeignEnumProto2.foreignFoo : nil) { + try { if let v = _storage._requiredForeignEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 22) } }() - try { if let v = _storage._requiredStringPiece ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._requiredStringPiece { try visitor.visitSingularStringField(value: v, fieldNumber: 24) } }() - try { if let v = _storage._requiredCord ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._requiredCord { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() try { if let v = _storage._recursiveMessage { @@ -4103,49 +4095,49 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2: SwiftProtobuf. try { if let v = _storage._data { try visitor.visitSingularGroupField(value: v, fieldNumber: 201) } }() - try { if let v = _storage._defaultInt32 ?? (alwaysVisitPrimitiveFields ? -123456789 : nil) { + try { if let v = _storage._defaultInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 241) } }() - try { if let v = _storage._defaultInt64 ?? (alwaysVisitPrimitiveFields ? -9123456789123456789 : nil) { + try { if let v = _storage._defaultInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 242) } }() - try { if let v = _storage._defaultUint32 ?? (alwaysVisitPrimitiveFields ? 2123456789 : nil) { + try { if let v = _storage._defaultUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 243) } }() - try { if let v = _storage._defaultUint64 ?? (alwaysVisitPrimitiveFields ? 10123456789123456789 : nil) { + try { if let v = _storage._defaultUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 244) } }() - try { if let v = _storage._defaultSint32 ?? (alwaysVisitPrimitiveFields ? -123456789 : nil) { + try { if let v = _storage._defaultSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 245) } }() - try { if let v = _storage._defaultSint64 ?? (alwaysVisitPrimitiveFields ? -9123456789123456789 : nil) { + try { if let v = _storage._defaultSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 246) } }() - try { if let v = _storage._defaultFixed32 ?? (alwaysVisitPrimitiveFields ? 2123456789 : nil) { + try { if let v = _storage._defaultFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 247) } }() - try { if let v = _storage._defaultFixed64 ?? (alwaysVisitPrimitiveFields ? 10123456789123456789 : nil) { + try { if let v = _storage._defaultFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 248) } }() - try { if let v = _storage._defaultSfixed32 ?? (alwaysVisitPrimitiveFields ? -123456789 : nil) { + try { if let v = _storage._defaultSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 249) } }() - try { if let v = _storage._defaultSfixed64 ?? (alwaysVisitPrimitiveFields ? -9123456789123456789 : nil) { + try { if let v = _storage._defaultSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 250) } }() - try { if let v = _storage._defaultFloat ?? (alwaysVisitPrimitiveFields ? 9e+09 : nil) { + try { if let v = _storage._defaultFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 251) } }() - try { if let v = _storage._defaultDouble ?? (alwaysVisitPrimitiveFields ? 7e+22 : nil) { + try { if let v = _storage._defaultDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 252) } }() - try { if let v = _storage._defaultBool ?? (alwaysVisitPrimitiveFields ? true : nil) { + try { if let v = _storage._defaultBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 253) } }() - try { if let v = _storage._defaultString ?? (alwaysVisitPrimitiveFields ? "Rosebud" : nil) { + try { if let v = _storage._defaultString { try visitor.visitSingularStringField(value: v, fieldNumber: 254) } }() - try { if let v = _storage._defaultBytes ?? (alwaysVisitPrimitiveFields ? Data([106, 111, 115, 104, 117, 97]) : nil) { + try { if let v = _storage._defaultBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 255) } }() } @@ -4274,13 +4266,12 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.NestedMessage: } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try { if let v = _storage._corecursive { @@ -4337,15 +4328,14 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.DataMessage: Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 202) } }() - try { if let v = self._groupUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 203) } }() try unknownFields.traverse(visitor: &visitor) @@ -4408,12 +4398,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorre } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._str ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._str { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() try unknownFields.traverse(visitor: &visitor) @@ -4450,12 +4439,11 @@ extension ProtobufTestMessages_Proto2_TestAllRequiredTypesProto2.MessageSetCorre } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._i ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._i { try visitor.visitSingularInt32Field(value: v, fieldNumber: 9) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Sources/SwiftProtobuf/descriptor.pb.swift b/Sources/SwiftProtobuf/descriptor.pb.swift index 56a32a8cd..86873535e 100644 --- a/Sources/SwiftProtobuf/descriptor.pb.swift +++ b/Sources/SwiftProtobuf/descriptor.pb.swift @@ -3038,10 +3038,10 @@ extension Google_Protobuf_FileDescriptorProto: Message, _MessageImplementationBa // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = self._package ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._package { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() if !self.dependency.isEmpty || alwaysVisitPrimitiveFields { @@ -3071,10 +3071,10 @@ extension Google_Protobuf_FileDescriptorProto: Message, _MessageImplementationBa if !self.weakDependency.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitRepeatedInt32Field(value: self.weakDependency, fieldNumber: 11) } - try { if let v = self._syntax ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._syntax { try visitor.visitSingularStringField(value: v, fieldNumber: 12) } }() - try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) { + try { if let v = self._edition { try visitor.visitSingularEnumField(value: v, fieldNumber: 14) } }() try unknownFields.traverse(visitor: &visitor) @@ -3195,7 +3195,7 @@ extension Google_Protobuf_DescriptorProto: Message, _MessageImplementationBase, // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() if !_storage._field.isEmpty || alwaysVisitPrimitiveFields { @@ -3281,15 +3281,14 @@ extension Google_Protobuf_DescriptorProto.ExtensionRange: Message, _MessageImple } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._start ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._start { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._end ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._end { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() try { if let v = self._options { @@ -3328,15 +3327,14 @@ extension Google_Protobuf_DescriptorProto.ReservedRange: Message, _MessageImplem } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._start ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._start { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._end ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._end { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() try unknownFields.traverse(visitor: &visitor) @@ -3392,7 +3390,7 @@ extension Google_Protobuf_ExtensionRangeOptions: Message, _MessageImplementation if !self.declaration.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitRepeatedMessageField(value: self.declaration, fieldNumber: 2) } - try { if let v = self._verification ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_ExtensionRangeOptions.VerificationState.unverified : nil) { + try { if let v = self._verification { try visitor.visitSingularEnumField(value: v, fieldNumber: 3) } }() try { if let v = self._features { @@ -3450,24 +3448,23 @@ extension Google_Protobuf_ExtensionRangeOptions.Declaration: Message, _MessageIm } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._number ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._number { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._fullName ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._fullName { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() - try { if let v = self._type ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._type { try visitor.visitSingularStringField(value: v, fieldNumber: 3) } }() - try { if let v = self._reserved ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._reserved { try visitor.visitSingularBoolField(value: v, fieldNumber: 5) } }() - try { if let v = self._repeated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._repeated { try visitor.visitSingularBoolField(value: v, fieldNumber: 6) } }() try unknownFields.traverse(visitor: &visitor) @@ -3528,42 +3525,41 @@ extension Google_Protobuf_FieldDescriptorProto: Message, _MessageImplementationB } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = self._extendee ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._extendee { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() - try { if let v = self._number ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._number { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = self._label ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldDescriptorProto.Label.optional : nil) { + try { if let v = self._label { try visitor.visitSingularEnumField(value: v, fieldNumber: 4) } }() - try { if let v = self._type ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldDescriptorProto.TypeEnum.double : nil) { + try { if let v = self._type { try visitor.visitSingularEnumField(value: v, fieldNumber: 5) } }() - try { if let v = self._typeName ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._typeName { try visitor.visitSingularStringField(value: v, fieldNumber: 6) } }() - try { if let v = self._defaultValue ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._defaultValue { try visitor.visitSingularStringField(value: v, fieldNumber: 7) } }() try { if let v = self._options { try visitor.visitSingularMessageField(value: v, fieldNumber: 8) } }() - try { if let v = self._oneofIndex ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._oneofIndex { try visitor.visitSingularInt32Field(value: v, fieldNumber: 9) } }() - try { if let v = self._jsonName ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._jsonName { try visitor.visitSingularStringField(value: v, fieldNumber: 10) } }() - try { if let v = self._proto3Optional ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._proto3Optional { try visitor.visitSingularBoolField(value: v, fieldNumber: 17) } }() try unknownFields.traverse(visitor: &visitor) @@ -3643,12 +3639,11 @@ extension Google_Protobuf_OneofDescriptorProto: Message, _MessageImplementationB } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() try { if let v = self._options { @@ -3703,7 +3698,7 @@ extension Google_Protobuf_EnumDescriptorProto: Message, _MessageImplementationBa // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() if !self.value.isEmpty || alwaysVisitPrimitiveFields { @@ -3753,15 +3748,14 @@ extension Google_Protobuf_EnumDescriptorProto.EnumReservedRange: Message, _Messa } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._start ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._start { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._end ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._end { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() try unknownFields.traverse(visitor: &visitor) @@ -3803,15 +3797,14 @@ extension Google_Protobuf_EnumValueDescriptorProto: Message, _MessageImplementat } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = self._number ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._number { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() try { if let v = self._options { @@ -3863,7 +3856,7 @@ extension Google_Protobuf_ServiceDescriptorProto: Message, _MessageImplementatio // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() if !self.method.isEmpty || alwaysVisitPrimitiveFields { @@ -3918,27 +3911,26 @@ extension Google_Protobuf_MethodDescriptorProto: Message, _MessageImplementation } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = self._inputType ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._inputType { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() - try { if let v = self._outputType ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._outputType { try visitor.visitSingularStringField(value: v, fieldNumber: 3) } }() try { if let v = self._options { try visitor.visitSingularMessageField(value: v, fieldNumber: 4) } }() - try { if let v = self._clientStreaming ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._clientStreaming { try visitor.visitSingularBoolField(value: v, fieldNumber: 5) } }() - try { if let v = self._serverStreaming ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._serverStreaming { try visitor.visitSingularBoolField(value: v, fieldNumber: 6) } }() try unknownFields.traverse(visitor: &visitor) @@ -4098,64 +4090,64 @@ extension Google_Protobuf_FileOptions: Message, _MessageImplementationBase, _Pro // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._javaPackage ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._javaPackage { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = _storage._javaOuterClassname ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._javaOuterClassname { try visitor.visitSingularStringField(value: v, fieldNumber: 8) } }() - try { if let v = _storage._optimizeFor ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FileOptions.OptimizeMode.speed : nil) { + try { if let v = _storage._optimizeFor { try visitor.visitSingularEnumField(value: v, fieldNumber: 9) } }() - try { if let v = _storage._javaMultipleFiles ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._javaMultipleFiles { try visitor.visitSingularBoolField(value: v, fieldNumber: 10) } }() - try { if let v = _storage._goPackage ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._goPackage { try visitor.visitSingularStringField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._ccGenericServices ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._ccGenericServices { try visitor.visitSingularBoolField(value: v, fieldNumber: 16) } }() - try { if let v = _storage._javaGenericServices ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._javaGenericServices { try visitor.visitSingularBoolField(value: v, fieldNumber: 17) } }() - try { if let v = _storage._pyGenericServices ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._pyGenericServices { try visitor.visitSingularBoolField(value: v, fieldNumber: 18) } }() - try { if let v = _storage._javaGenerateEqualsAndHash ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._javaGenerateEqualsAndHash { try visitor.visitSingularBoolField(value: v, fieldNumber: 20) } }() - try { if let v = _storage._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._deprecated { try visitor.visitSingularBoolField(value: v, fieldNumber: 23) } }() - try { if let v = _storage._javaStringCheckUtf8 ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._javaStringCheckUtf8 { try visitor.visitSingularBoolField(value: v, fieldNumber: 27) } }() - try { if let v = _storage._ccEnableArenas ?? (alwaysVisitPrimitiveFields ? true : nil) { + try { if let v = _storage._ccEnableArenas { try visitor.visitSingularBoolField(value: v, fieldNumber: 31) } }() - try { if let v = _storage._objcClassPrefix ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._objcClassPrefix { try visitor.visitSingularStringField(value: v, fieldNumber: 36) } }() - try { if let v = _storage._csharpNamespace ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._csharpNamespace { try visitor.visitSingularStringField(value: v, fieldNumber: 37) } }() - try { if let v = _storage._swiftPrefix ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._swiftPrefix { try visitor.visitSingularStringField(value: v, fieldNumber: 39) } }() - try { if let v = _storage._phpClassPrefix ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._phpClassPrefix { try visitor.visitSingularStringField(value: v, fieldNumber: 40) } }() - try { if let v = _storage._phpNamespace ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._phpNamespace { try visitor.visitSingularStringField(value: v, fieldNumber: 41) } }() - try { if let v = _storage._phpGenericServices ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._phpGenericServices { try visitor.visitSingularBoolField(value: v, fieldNumber: 42) } }() - try { if let v = _storage._phpMetadataNamespace ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._phpMetadataNamespace { try visitor.visitSingularStringField(value: v, fieldNumber: 44) } }() - try { if let v = _storage._rubyPackage ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._rubyPackage { try visitor.visitSingularStringField(value: v, fieldNumber: 45) } }() try { if let v = _storage._features { @@ -4259,19 +4251,19 @@ extension Google_Protobuf_MessageOptions: Message, _MessageImplementationBase, _ // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._messageSetWireFormat ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._messageSetWireFormat { try visitor.visitSingularBoolField(value: v, fieldNumber: 1) } }() - try { if let v = self._noStandardDescriptorAccessor ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._noStandardDescriptorAccessor { try visitor.visitSingularBoolField(value: v, fieldNumber: 2) } }() - try { if let v = self._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._deprecated { try visitor.visitSingularBoolField(value: v, fieldNumber: 3) } }() - try { if let v = self._mapEntry ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._mapEntry { try visitor.visitSingularBoolField(value: v, fieldNumber: 7) } }() - try { if let v = self._deprecatedLegacyJsonFieldConflicts ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._deprecatedLegacyJsonFieldConflicts { try visitor.visitSingularBoolField(value: v, fieldNumber: 11) } }() try { if let v = self._features { @@ -4404,31 +4396,31 @@ extension Google_Protobuf_FieldOptions: Message, _MessageImplementationBase, _Pr // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._ctype ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldOptions.CType.string : nil) { + try { if let v = _storage._ctype { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) } }() - try { if let v = _storage._packed ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._packed { try visitor.visitSingularBoolField(value: v, fieldNumber: 2) } }() - try { if let v = _storage._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._deprecated { try visitor.visitSingularBoolField(value: v, fieldNumber: 3) } }() - try { if let v = _storage._lazy ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._lazy { try visitor.visitSingularBoolField(value: v, fieldNumber: 5) } }() - try { if let v = _storage._jstype ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldOptions.JSType.jsNormal : nil) { + try { if let v = _storage._jstype { try visitor.visitSingularEnumField(value: v, fieldNumber: 6) } }() - try { if let v = _storage._weak ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._weak { try visitor.visitSingularBoolField(value: v, fieldNumber: 10) } }() - try { if let v = _storage._unverifiedLazy ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._unverifiedLazy { try visitor.visitSingularBoolField(value: v, fieldNumber: 15) } }() - try { if let v = _storage._debugRedact ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._debugRedact { try visitor.visitSingularBoolField(value: v, fieldNumber: 16) } }() - try { if let v = _storage._retention ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FieldOptions.OptionRetention.retentionUnknown : nil) { + try { if let v = _storage._retention { try visitor.visitSingularEnumField(value: v, fieldNumber: 17) } }() if !_storage._targets.isEmpty || alwaysVisitPrimitiveFields { @@ -4536,15 +4528,14 @@ extension Google_Protobuf_FieldOptions.EditionDefault: Message, _MessageImplemen } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._value ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._value { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() - try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) { + try { if let v = self._edition { try visitor.visitSingularEnumField(value: v, fieldNumber: 3) } }() try unknownFields.traverse(visitor: &visitor) @@ -4653,13 +4644,13 @@ extension Google_Protobuf_EnumOptions: Message, _MessageImplementationBase, _Pro // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._allowAlias ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._allowAlias { try visitor.visitSingularBoolField(value: v, fieldNumber: 2) } }() - try { if let v = self._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._deprecated { try visitor.visitSingularBoolField(value: v, fieldNumber: 3) } }() - try { if let v = self._deprecatedLegacyJsonFieldConflicts ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._deprecatedLegacyJsonFieldConflicts { try visitor.visitSingularBoolField(value: v, fieldNumber: 6) } }() try { if let v = self._features { @@ -4723,13 +4714,13 @@ extension Google_Protobuf_EnumValueOptions: Message, _MessageImplementationBase, // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._deprecated { try visitor.visitSingularBoolField(value: v, fieldNumber: 1) } }() try { if let v = self._features { try visitor.visitSingularMessageField(value: v, fieldNumber: 2) } }() - try { if let v = self._debugRedact ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._debugRedact { try visitor.visitSingularBoolField(value: v, fieldNumber: 3) } }() if !self.uninterpretedOption.isEmpty || alwaysVisitPrimitiveFields { @@ -4787,7 +4778,7 @@ extension Google_Protobuf_ServiceOptions: Message, _MessageImplementationBase, _ // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._deprecated { try visitor.visitSingularBoolField(value: v, fieldNumber: 33) } }() try { if let v = self._features { @@ -4849,10 +4840,10 @@ extension Google_Protobuf_MethodOptions: Message, _MessageImplementationBase, _P // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._deprecated ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._deprecated { try visitor.visitSingularBoolField(value: v, fieldNumber: 33) } }() - try { if let v = self._idempotencyLevel ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_MethodOptions.IdempotencyLevel.idempotencyUnknown : nil) { + try { if let v = self._idempotencyLevel { try visitor.visitSingularEnumField(value: v, fieldNumber: 34) } }() try { if let v = self._features { @@ -4928,22 +4919,22 @@ extension Google_Protobuf_UninterpretedOption: Message, _MessageImplementationBa if !self.name.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitRepeatedMessageField(value: self.name, fieldNumber: 2) } - try { if let v = self._identifierValue ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._identifierValue { try visitor.visitSingularStringField(value: v, fieldNumber: 3) } }() - try { if let v = self._positiveIntValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._positiveIntValue { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = self._negativeIntValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._negativeIntValue { try visitor.visitSingularInt64Field(value: v, fieldNumber: 5) } }() - try { if let v = self._doubleValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._doubleValue { try visitor.visitSingularDoubleField(value: v, fieldNumber: 6) } }() - try { if let v = self._stringValue ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = self._stringValue { try visitor.visitSingularBytesField(value: v, fieldNumber: 7) } }() - try { if let v = self._aggregateValue ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._aggregateValue { try visitor.visitSingularStringField(value: v, fieldNumber: 8) } }() try unknownFields.traverse(visitor: &visitor) @@ -4989,15 +4980,14 @@ extension Google_Protobuf_UninterpretedOption.NamePart: Message, _MessageImpleme } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._namePart ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._namePart { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = self._isExtension ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._isExtension { try visitor.visitSingularBoolField(value: v, fieldNumber: 2) } }() try unknownFields.traverse(visitor: &visitor) @@ -5047,27 +5037,26 @@ extension Google_Protobuf_FeatureSet: Message, _MessageImplementationBase, _Prot } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._fieldPresence ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.FieldPresence.unknown : nil) { + try { if let v = self._fieldPresence { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) } }() - try { if let v = self._enumType ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.EnumType.unknown : nil) { + try { if let v = self._enumType { try visitor.visitSingularEnumField(value: v, fieldNumber: 2) } }() - try { if let v = self._repeatedFieldEncoding ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.RepeatedFieldEncoding.unknown : nil) { + try { if let v = self._repeatedFieldEncoding { try visitor.visitSingularEnumField(value: v, fieldNumber: 3) } }() - try { if let v = self._utf8Validation ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.Utf8Validation.unknown : nil) { + try { if let v = self._utf8Validation { try visitor.visitSingularEnumField(value: v, fieldNumber: 4) } }() - try { if let v = self._messageEncoding ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.MessageEncoding.unknown : nil) { + try { if let v = self._messageEncoding { try visitor.visitSingularEnumField(value: v, fieldNumber: 5) } }() - try { if let v = self._jsonFormat ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_FeatureSet.JsonFormat.unknown : nil) { + try { if let v = self._jsonFormat { try visitor.visitSingularEnumField(value: v, fieldNumber: 6) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 1000, end: 10000) @@ -5172,10 +5161,10 @@ extension Google_Protobuf_FeatureSetDefaults: Message, _MessageImplementationBas if !self.defaults.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitRepeatedMessageField(value: self.defaults, fieldNumber: 1) } - try { if let v = self._minimumEdition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) { + try { if let v = self._minimumEdition { try visitor.visitSingularEnumField(value: v, fieldNumber: 4) } }() - try { if let v = self._maximumEdition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) { + try { if let v = self._maximumEdition { try visitor.visitSingularEnumField(value: v, fieldNumber: 5) } }() try unknownFields.traverse(visitor: &visitor) @@ -5216,7 +5205,6 @@ extension Google_Protobuf_FeatureSetDefaults.FeatureSetEditionDefault: Message, } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and @@ -5224,7 +5212,7 @@ extension Google_Protobuf_FeatureSetDefaults.FeatureSetEditionDefault: Message, try { if let v = self._features { try visitor.visitSingularMessageField(value: v, fieldNumber: 2) } }() - try { if let v = self._edition ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_Edition.unknown : nil) { + try { if let v = self._edition { try visitor.visitSingularEnumField(value: v, fieldNumber: 3) } }() try unknownFields.traverse(visitor: &visitor) @@ -5309,10 +5297,10 @@ extension Google_Protobuf_SourceCodeInfo.Location: Message, _MessageImplementati if !self.span.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitPackedInt32Field(value: self.span, fieldNumber: 2) } - try { if let v = self._leadingComments ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._leadingComments { try visitor.visitSingularStringField(value: v, fieldNumber: 3) } }() - try { if let v = self._trailingComments ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._trailingComments { try visitor.visitSingularStringField(value: v, fieldNumber: 4) } }() if !self.leadingDetachedComments.isEmpty || alwaysVisitPrimitiveFields { @@ -5400,16 +5388,16 @@ extension Google_Protobuf_GeneratedCodeInfo.Annotation: Message, _MessageImpleme if !self.path.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitPackedInt32Field(value: self.path, fieldNumber: 1) } - try { if let v = self._sourceFile ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._sourceFile { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() - try { if let v = self._begin ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._begin { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = self._end ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._end { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = self._semantic ?? (alwaysVisitPrimitiveFields ? Google_Protobuf_GeneratedCodeInfo.Annotation.Semantic.none : nil) { + try { if let v = self._semantic { try visitor.visitSingularEnumField(value: v, fieldNumber: 5) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Sources/SwiftProtobufPluginLibrary/plugin.pb.swift b/Sources/SwiftProtobufPluginLibrary/plugin.pb.swift index 055075a40..277b9487a 100644 --- a/Sources/SwiftProtobufPluginLibrary/plugin.pb.swift +++ b/Sources/SwiftProtobufPluginLibrary/plugin.pb.swift @@ -394,21 +394,20 @@ extension Google_Protobuf_Compiler_Version: SwiftProtobuf.Message, SwiftProtobuf } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._major ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._major { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._minor ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._minor { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = self._patch ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._patch { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = self._suffix ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._suffix { try visitor.visitSingularStringField(value: v, fieldNumber: 4) } }() try unknownFields.traverse(visitor: &visitor) @@ -465,7 +464,7 @@ extension Google_Protobuf_Compiler_CodeGeneratorRequest: SwiftProtobuf.Message, if !self.fileToGenerate.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitRepeatedStringField(value: self.fileToGenerate, fieldNumber: 1) } - try { if let v = self._parameter ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._parameter { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() try { if let v = self._compilerVersion { @@ -523,16 +522,16 @@ extension Google_Protobuf_Compiler_CodeGeneratorResponse: SwiftProtobuf.Message, // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._error ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._error { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = self._supportedFeatures ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._supportedFeatures { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = self._minimumEdition ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._minimumEdition { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = self._maximumEdition ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._maximumEdition { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() if !self.file.isEmpty || alwaysVisitPrimitiveFields { @@ -585,18 +584,17 @@ extension Google_Protobuf_Compiler_CodeGeneratorResponse.File: SwiftProtobuf.Mes } public func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._name ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._name { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = self._insertionPoint ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._insertionPoint { try visitor.visitSingularStringField(value: v, fieldNumber: 2) } }() - try { if let v = self._content ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._content { try visitor.visitSingularStringField(value: v, fieldNumber: 15) } }() try { if let v = self._generatedCodeInfo { diff --git a/Tests/SwiftProtobufTests/fuzz_testing.pb.swift b/Tests/SwiftProtobufTests/fuzz_testing.pb.swift index cac69d96c..e1dc23652 100644 --- a/Tests/SwiftProtobufTests/fuzz_testing.pb.swift +++ b/Tests/SwiftProtobufTests/fuzz_testing.pb.swift @@ -3859,52 +3859,52 @@ extension SwiftProtoTesting_Fuzz_Message: SwiftProtobuf.Message, SwiftProtobuf._ // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._singularInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._singularInt64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._singularUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._singularUint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._singularSint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._singularSint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._singularFixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._singularFixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._singularSfixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._singularSfixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._singularFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._singularDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._singularDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._singularBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._singularBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._singularString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._singularString { try visitor.visitSingularStringField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._singularBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = _storage._singularBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 15) } }() - try { if let v = _storage._singularEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Fuzz_AnEnum.zero : nil) { + try { if let v = _storage._singularEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 16) } }() try { if let v = _storage._singularGroup { @@ -5002,12 +5002,11 @@ extension SwiftProtoTesting_Fuzz_Message.SingularGroup: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 18) } }() try unknownFields.traverse(visitor: &visitor) @@ -5039,12 +5038,11 @@ extension SwiftProtoTesting_Fuzz_Message.RepeatedGroup: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 48) } }() try unknownFields.traverse(visitor: &visitor) @@ -5076,12 +5074,11 @@ extension SwiftProtoTesting_Fuzz_Message.OneofGroup: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 78) } }() try unknownFields.traverse(visitor: &visitor) @@ -5138,12 +5135,11 @@ extension SwiftProtoTesting_Fuzz_SingularGroup_ext: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1018) } }() try unknownFields.traverse(visitor: &visitor) @@ -5175,12 +5171,11 @@ extension SwiftProtoTesting_Fuzz_RepeatedGroup_ext: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._groupField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._groupField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1048) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest.pb.swift b/Tests/SwiftProtobufTests/unittest.pb.swift index 5e68f535a..3be383d72 100644 --- a/Tests/SwiftProtobufTests/unittest.pb.swift +++ b/Tests/SwiftProtobufTests/unittest.pb.swift @@ -4346,49 +4346,49 @@ extension SwiftProtoTesting_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._ // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._optionalInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._optionalInt64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._optionalUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._optionalUint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._optionalSint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._optionalSint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._optionalFixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._optionalFixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._optionalSfixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._optionalSfixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._optionalFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._optionalDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._optionalBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._optionalBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._optionalString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._optionalString { try visitor.visitSingularStringField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._optionalBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = _storage._optionalBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 15) } }() try { if let v = _storage._optionalGroup { @@ -4403,19 +4403,19 @@ extension SwiftProtoTesting_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._ try { if let v = _storage._optionalImportMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 20) } }() - try { if let v = _storage._optionalNestedEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_TestAllTypes.NestedEnum.foo : nil) { + try { if let v = _storage._optionalNestedEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 21) } }() - try { if let v = _storage._optionalForeignEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_ForeignEnum.foreignFoo : nil) { + try { if let v = _storage._optionalForeignEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 22) } }() - try { if let v = _storage._optionalImportEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Import_ImportEnum.importFoo : nil) { + try { if let v = _storage._optionalImportEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 23) } }() - try { if let v = _storage._optionalStringPiece ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._optionalStringPiece { try visitor.visitSingularStringField(value: v, fieldNumber: 24) } }() - try { if let v = _storage._optionalCord ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._optionalCord { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() try { if let v = _storage._optionalPublicImportMessage { @@ -4502,64 +4502,64 @@ extension SwiftProtoTesting_TestAllTypes: SwiftProtobuf.Message, SwiftProtobuf._ if !_storage._repeatedLazyMessage.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitRepeatedMessageField(value: _storage._repeatedLazyMessage, fieldNumber: 57) } - try { if let v = _storage._defaultInt32 ?? (alwaysVisitPrimitiveFields ? 41 : nil) { + try { if let v = _storage._defaultInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 61) } }() - try { if let v = _storage._defaultInt64 ?? (alwaysVisitPrimitiveFields ? 42 : nil) { + try { if let v = _storage._defaultInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 62) } }() - try { if let v = _storage._defaultUint32 ?? (alwaysVisitPrimitiveFields ? 43 : nil) { + try { if let v = _storage._defaultUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 63) } }() - try { if let v = _storage._defaultUint64 ?? (alwaysVisitPrimitiveFields ? 44 : nil) { + try { if let v = _storage._defaultUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 64) } }() - try { if let v = _storage._defaultSint32 ?? (alwaysVisitPrimitiveFields ? -45 : nil) { + try { if let v = _storage._defaultSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 65) } }() - try { if let v = _storage._defaultSint64 ?? (alwaysVisitPrimitiveFields ? 46 : nil) { + try { if let v = _storage._defaultSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 66) } }() - try { if let v = _storage._defaultFixed32 ?? (alwaysVisitPrimitiveFields ? 47 : nil) { + try { if let v = _storage._defaultFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 67) } }() - try { if let v = _storage._defaultFixed64 ?? (alwaysVisitPrimitiveFields ? 48 : nil) { + try { if let v = _storage._defaultFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 68) } }() - try { if let v = _storage._defaultSfixed32 ?? (alwaysVisitPrimitiveFields ? 49 : nil) { + try { if let v = _storage._defaultSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 69) } }() - try { if let v = _storage._defaultSfixed64 ?? (alwaysVisitPrimitiveFields ? -50 : nil) { + try { if let v = _storage._defaultSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 70) } }() - try { if let v = _storage._defaultFloat ?? (alwaysVisitPrimitiveFields ? 51.5 : nil) { + try { if let v = _storage._defaultFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 71) } }() - try { if let v = _storage._defaultDouble ?? (alwaysVisitPrimitiveFields ? 52000 : nil) { + try { if let v = _storage._defaultDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 72) } }() - try { if let v = _storage._defaultBool ?? (alwaysVisitPrimitiveFields ? true : nil) { + try { if let v = _storage._defaultBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 73) } }() - try { if let v = _storage._defaultString ?? (alwaysVisitPrimitiveFields ? "hello" : nil) { + try { if let v = _storage._defaultString { try visitor.visitSingularStringField(value: v, fieldNumber: 74) } }() - try { if let v = _storage._defaultBytes ?? (alwaysVisitPrimitiveFields ? Data([119, 111, 114, 108, 100]) : nil) { + try { if let v = _storage._defaultBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 75) } }() - try { if let v = _storage._defaultNestedEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_TestAllTypes.NestedEnum.bar : nil) { + try { if let v = _storage._defaultNestedEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 81) } }() - try { if let v = _storage._defaultForeignEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_ForeignEnum.foreignBar : nil) { + try { if let v = _storage._defaultForeignEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 82) } }() - try { if let v = _storage._defaultImportEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Import_ImportEnum.importBar : nil) { + try { if let v = _storage._defaultImportEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 83) } }() - try { if let v = _storage._defaultStringPiece ?? (alwaysVisitPrimitiveFields ? "abc" : nil) { + try { if let v = _storage._defaultStringPiece { try visitor.visitSingularStringField(value: v, fieldNumber: 84) } }() - try { if let v = _storage._defaultCord ?? (alwaysVisitPrimitiveFields ? "123" : nil) { + try { if let v = _storage._defaultCord { try visitor.visitSingularStringField(value: v, fieldNumber: 85) } }() switch _storage._oneofField { @@ -4700,12 +4700,11 @@ extension SwiftProtoTesting_TestAllTypes.NestedMessage: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bb ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bb { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -4737,12 +4736,11 @@ extension SwiftProtoTesting_TestAllTypes.OptionalGroup: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 17) } }() try unknownFields.traverse(visitor: &visitor) @@ -4774,12 +4772,11 @@ extension SwiftProtoTesting_TestAllTypes.RepeatedGroup: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 47) } }() try unknownFields.traverse(visitor: &visitor) @@ -4914,15 +4911,14 @@ extension SwiftProtoTesting_ForeignMessage: SwiftProtobuf.Message, SwiftProtobuf } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._d ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._d { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() try unknownFields.traverse(visitor: &visitor) @@ -4984,12 +4980,11 @@ extension SwiftProtoTesting_OptionalGroup_extension: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 17) } }() try unknownFields.traverse(visitor: &visitor) @@ -5021,12 +5016,11 @@ extension SwiftProtoTesting_RepeatedGroup_extension: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 47) } }() try unknownFields.traverse(visitor: &visitor) @@ -5240,109 +5234,108 @@ extension SwiftProtoTesting_TestRequired: SwiftProtobuf.Message, SwiftProtobuf._ } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._dummy2 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy2 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._b ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._b { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._dummy4 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy4 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._dummy5 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy5 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._dummy6 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy6 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._dummy7 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy7 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._dummy8 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy8 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._dummy9 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy9 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._dummy10 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy10 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._dummy11 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy11 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 11) } }() - try { if let v = _storage._dummy12 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy12 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 12) } }() - try { if let v = _storage._dummy13 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy13 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 13) } }() - try { if let v = _storage._dummy14 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy14 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 14) } }() - try { if let v = _storage._dummy15 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy15 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 15) } }() - try { if let v = _storage._dummy16 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy16 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 16) } }() - try { if let v = _storage._dummy17 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy17 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 17) } }() - try { if let v = _storage._dummy18 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy18 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 18) } }() - try { if let v = _storage._dummy19 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy19 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 19) } }() - try { if let v = _storage._dummy20 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy20 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 20) } }() - try { if let v = _storage._dummy21 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy21 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 21) } }() - try { if let v = _storage._dummy22 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy22 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 22) } }() - try { if let v = _storage._dummy23 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy23 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 23) } }() - try { if let v = _storage._dummy24 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy24 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 24) } }() - try { if let v = _storage._dummy25 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy25 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 25) } }() - try { if let v = _storage._dummy26 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy26 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 26) } }() - try { if let v = _storage._dummy27 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy27 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 27) } }() - try { if let v = _storage._dummy28 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy28 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 28) } }() - try { if let v = _storage._dummy29 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy29 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 29) } }() - try { if let v = _storage._dummy30 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy30 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 30) } }() - try { if let v = _storage._dummy31 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy31 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 31) } }() - try { if let v = _storage._dummy32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dummy32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 32) } }() - try { if let v = _storage._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._c { try visitor.visitSingularInt32Field(value: v, fieldNumber: 33) } }() try { if let v = _storage._optionalForeign { @@ -5442,7 +5435,7 @@ extension SwiftProtoTesting_TestRequiredForeign: SwiftProtobuf.Message, SwiftPro if !self.repeatedMessage.isEmpty || alwaysVisitPrimitiveFields { try visitor.visitRepeatedMessageField(value: self.repeatedMessage, fieldNumber: 2) } - try { if let v = self._dummy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._dummy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() try { if let v = self._optionalLazyMessage { @@ -5558,15 +5551,14 @@ extension SwiftProtoTesting_TestReallyLargeTagNumber: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._bb ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bb { try visitor.visitSingularInt32Field(value: v, fieldNumber: 268435455) } }() try unknownFields.traverse(visitor: &visitor) @@ -5625,7 +5617,6 @@ extension SwiftProtoTesting_TestRecursiveMessage: SwiftProtobuf.Message, SwiftPr } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations @@ -5634,7 +5625,7 @@ extension SwiftProtoTesting_TestRecursiveMessage: SwiftProtobuf.Message, SwiftPr try { if let v = _storage._a { try visitor.visitSingularMessageField(value: v, fieldNumber: 1) } }() - try { if let v = _storage._i ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._i { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() } @@ -5689,20 +5680,19 @@ extension SwiftProtoTesting_TestFieldOrderings: SwiftProtobuf.Message, SwiftProt } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._myInt ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._myInt { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 2, end: 11) - try { if let v = self._myString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._myString { try visitor.visitSingularStringField(value: v, fieldNumber: 11) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 12, end: 101) - try { if let v = self._myFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._myFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 101) } }() try { if let v = self._optionalNestedMessage { @@ -5743,15 +5733,14 @@ extension SwiftProtoTesting_TestFieldOrderings.NestedMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bb ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bb { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._oo ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._oo { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() try unknownFields.traverse(visitor: &visitor) @@ -5910,91 +5899,90 @@ extension SwiftProtoTesting_TestExtremeDefaultValues: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._escapedBytes ?? (alwaysVisitPrimitiveFields ? Data([0, 1, 7, 8, 12, 10, 13, 9, 11, 92, 39, 34, 254]) : nil) { + try { if let v = _storage._escapedBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 1) } }() - try { if let v = _storage._largeUint32 ?? (alwaysVisitPrimitiveFields ? 4294967295 : nil) { + try { if let v = _storage._largeUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._largeUint64 ?? (alwaysVisitPrimitiveFields ? 18446744073709551615 : nil) { + try { if let v = _storage._largeUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._smallInt32 ?? (alwaysVisitPrimitiveFields ? -2147483647 : nil) { + try { if let v = _storage._smallInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._smallInt64 ?? (alwaysVisitPrimitiveFields ? -9223372036854775807 : nil) { + try { if let v = _storage._smallInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._utf8String ?? (alwaysVisitPrimitiveFields ? "ሴ" : nil) { + try { if let v = _storage._utf8String { try visitor.visitSingularStringField(value: v, fieldNumber: 6) } }() - try { if let v = _storage._zeroFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._zeroFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 7) } }() - try { if let v = _storage._oneFloat ?? (alwaysVisitPrimitiveFields ? 1 : nil) { + try { if let v = _storage._oneFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 8) } }() - try { if let v = _storage._smallFloat ?? (alwaysVisitPrimitiveFields ? 1.5 : nil) { + try { if let v = _storage._smallFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 9) } }() - try { if let v = _storage._negativeOneFloat ?? (alwaysVisitPrimitiveFields ? -1 : nil) { + try { if let v = _storage._negativeOneFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 10) } }() - try { if let v = _storage._negativeFloat ?? (alwaysVisitPrimitiveFields ? -1.5 : nil) { + try { if let v = _storage._negativeFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._largeFloat ?? (alwaysVisitPrimitiveFields ? 2e+08 : nil) { + try { if let v = _storage._largeFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._smallNegativeFloat ?? (alwaysVisitPrimitiveFields ? -8e-28 : nil) { + try { if let v = _storage._smallNegativeFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._infDouble ?? (alwaysVisitPrimitiveFields ? Double.infinity : nil) { + try { if let v = _storage._infDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._negInfDouble ?? (alwaysVisitPrimitiveFields ? -Double.infinity : nil) { + try { if let v = _storage._negInfDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 15) } }() - try { if let v = _storage._nanDouble ?? (alwaysVisitPrimitiveFields ? Double.nan : nil) { + try { if let v = _storage._nanDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 16) } }() - try { if let v = _storage._infFloat ?? (alwaysVisitPrimitiveFields ? Float.infinity : nil) { + try { if let v = _storage._infFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 17) } }() - try { if let v = _storage._negInfFloat ?? (alwaysVisitPrimitiveFields ? -Float.infinity : nil) { + try { if let v = _storage._negInfFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 18) } }() - try { if let v = _storage._nanFloat ?? (alwaysVisitPrimitiveFields ? Float.nan : nil) { + try { if let v = _storage._nanFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 19) } }() - try { if let v = _storage._cppTrigraph ?? (alwaysVisitPrimitiveFields ? "? ? ?? ?? ??? ??/ ??-" : nil) { + try { if let v = _storage._cppTrigraph { try visitor.visitSingularStringField(value: v, fieldNumber: 20) } }() - try { if let v = _storage._reallySmallInt32 ?? (alwaysVisitPrimitiveFields ? -2147483648 : nil) { + try { if let v = _storage._reallySmallInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 21) } }() - try { if let v = _storage._reallySmallInt64 ?? (alwaysVisitPrimitiveFields ? -9223372036854775808 : nil) { + try { if let v = _storage._reallySmallInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 22) } }() - try { if let v = _storage._stringWithZero ?? (alwaysVisitPrimitiveFields ? "hel\0lo" : nil) { + try { if let v = _storage._stringWithZero { try visitor.visitSingularStringField(value: v, fieldNumber: 23) } }() - try { if let v = _storage._bytesWithZero ?? (alwaysVisitPrimitiveFields ? Data([119, 111, 114, 0, 108, 100]) : nil) { + try { if let v = _storage._bytesWithZero { try visitor.visitSingularBytesField(value: v, fieldNumber: 24) } }() - try { if let v = _storage._stringPieceWithZero ?? (alwaysVisitPrimitiveFields ? "ab\0c" : nil) { + try { if let v = _storage._stringPieceWithZero { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() - try { if let v = _storage._cordWithZero ?? (alwaysVisitPrimitiveFields ? "12\03" : nil) { + try { if let v = _storage._cordWithZero { try visitor.visitSingularStringField(value: v, fieldNumber: 26) } }() - try { if let v = _storage._replacementString ?? (alwaysVisitPrimitiveFields ? "${unknown}" : nil) { + try { if let v = _storage._replacementString { try visitor.visitSingularStringField(value: v, fieldNumber: 27) } }() } @@ -6159,15 +6147,14 @@ extension SwiftProtoTesting_TestOneof.FooGroup: SwiftProtobuf.Message, SwiftProt } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = self._b ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._b { try visitor.visitSingularStringField(value: v, fieldNumber: 6) } }() try unknownFields.traverse(visitor: &visitor) @@ -6306,12 +6293,11 @@ extension SwiftProtoTesting_TestRequiredOneof.NestedMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._requiredDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requiredDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_import.pb.swift b/Tests/SwiftProtobufTests/unittest_import.pb.swift index 02bc37eb7..9eb455720 100644 --- a/Tests/SwiftProtobufTests/unittest_import.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_import.pb.swift @@ -137,12 +137,11 @@ extension SwiftProtoTesting_Import_ImportMessage: SwiftProtobuf.Message, SwiftPr } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._d ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._d { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_import_public.pb.swift b/Tests/SwiftProtobufTests/unittest_import_public.pb.swift index d2017af0c..f8de8e35b 100644 --- a/Tests/SwiftProtobufTests/unittest_import_public.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_import_public.pb.swift @@ -96,12 +96,11 @@ extension SwiftProtoTesting_Import_PublicImportMessage: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._e ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._e { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_mset.pb.swift b/Tests/SwiftProtobufTests/unittest_mset.pb.swift index 44233156c..34c19ca13 100644 --- a/Tests/SwiftProtobufTests/unittest_mset.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_mset.pb.swift @@ -333,18 +333,17 @@ extension SwiftProtoTesting_TestMessageSetExtension1: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._i ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._i { try visitor.visitSingularInt32Field(value: v, fieldNumber: 15) } }() try { if let v = self._recursive { try visitor.visitSingularMessageField(value: v, fieldNumber: 16) } }() - try { if let v = self._testAliasing ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._testAliasing { try visitor.visitSingularStringField(value: v, fieldNumber: 17) } }() try unknownFields.traverse(visitor: &visitor) @@ -378,12 +377,11 @@ extension SwiftProtoTesting_TestMessageSetExtension2: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._str ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._str { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() try unknownFields.traverse(visitor: &visitor) @@ -461,15 +459,14 @@ extension SwiftProtoTesting_RawMessageSet.Item: SwiftProtobuf.Message, SwiftProt } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._typeID ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._typeID { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = self._message ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = self._message { try visitor.visitSingularBytesField(value: v, fieldNumber: 3) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_preserve_unknown_enum2.pb.swift b/Tests/SwiftProtobufTests/unittest_preserve_unknown_enum2.pb.swift index 85b64c385..73361adfb 100644 --- a/Tests/SwiftProtobufTests/unittest_preserve_unknown_enum2.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_preserve_unknown_enum2.pb.swift @@ -191,7 +191,7 @@ extension SwiftProtoTesting_UnknownEnum_Proto2_MyMessage: SwiftProtobuf.Message, // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._e ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_UnknownEnum_Proto2_MyEnum.foo : nil) { + try { if let v = self._e { try visitor.visitSingularEnumField(value: v, fieldNumber: 1) } }() if !self.repeatedE.isEmpty || alwaysVisitPrimitiveFields { diff --git a/Tests/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift index b3e232d02..6638e4d40 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_all_required_types.pb.swift @@ -1031,55 +1031,54 @@ extension SwiftProtoTesting_TestAllRequiredTypes: SwiftProtobuf.Message, SwiftPr } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._requiredInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._requiredInt64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._requiredUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._requiredUint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._requiredSint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._requiredSint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._requiredFixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._requiredFixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._requiredSfixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._requiredSfixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._requiredFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._requiredDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requiredDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._requiredBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._requiredBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._requiredString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._requiredString { try visitor.visitSingularStringField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._requiredBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = _storage._requiredBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 15) } }() try { if let v = _storage._requiredGroup { @@ -1094,19 +1093,19 @@ extension SwiftProtoTesting_TestAllRequiredTypes: SwiftProtobuf.Message, SwiftPr try { if let v = _storage._requiredImportMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 20) } }() - try { if let v = _storage._requiredNestedEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_TestAllRequiredTypes.NestedEnum.foo : nil) { + try { if let v = _storage._requiredNestedEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 21) } }() - try { if let v = _storage._requiredForeignEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_ForeignEnum.foreignFoo : nil) { + try { if let v = _storage._requiredForeignEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 22) } }() - try { if let v = _storage._requiredImportEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Import_ImportEnum.importFoo : nil) { + try { if let v = _storage._requiredImportEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 23) } }() - try { if let v = _storage._requiredStringPiece ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._requiredStringPiece { try visitor.visitSingularStringField(value: v, fieldNumber: 24) } }() - try { if let v = _storage._requiredCord ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._requiredCord { try visitor.visitSingularStringField(value: v, fieldNumber: 25) } }() try { if let v = _storage._requiredPublicImportMessage { @@ -1115,64 +1114,64 @@ extension SwiftProtoTesting_TestAllRequiredTypes: SwiftProtobuf.Message, SwiftPr try { if let v = _storage._requiredLazyMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 27) } }() - try { if let v = _storage._defaultInt32 ?? (alwaysVisitPrimitiveFields ? 41 : nil) { + try { if let v = _storage._defaultInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 61) } }() - try { if let v = _storage._defaultInt64 ?? (alwaysVisitPrimitiveFields ? 42 : nil) { + try { if let v = _storage._defaultInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 62) } }() - try { if let v = _storage._defaultUint32 ?? (alwaysVisitPrimitiveFields ? 43 : nil) { + try { if let v = _storage._defaultUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 63) } }() - try { if let v = _storage._defaultUint64 ?? (alwaysVisitPrimitiveFields ? 44 : nil) { + try { if let v = _storage._defaultUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 64) } }() - try { if let v = _storage._defaultSint32 ?? (alwaysVisitPrimitiveFields ? -45 : nil) { + try { if let v = _storage._defaultSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 65) } }() - try { if let v = _storage._defaultSint64 ?? (alwaysVisitPrimitiveFields ? 46 : nil) { + try { if let v = _storage._defaultSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 66) } }() - try { if let v = _storage._defaultFixed32 ?? (alwaysVisitPrimitiveFields ? 47 : nil) { + try { if let v = _storage._defaultFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 67) } }() - try { if let v = _storage._defaultFixed64 ?? (alwaysVisitPrimitiveFields ? 48 : nil) { + try { if let v = _storage._defaultFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 68) } }() - try { if let v = _storage._defaultSfixed32 ?? (alwaysVisitPrimitiveFields ? 49 : nil) { + try { if let v = _storage._defaultSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 69) } }() - try { if let v = _storage._defaultSfixed64 ?? (alwaysVisitPrimitiveFields ? -50 : nil) { + try { if let v = _storage._defaultSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 70) } }() - try { if let v = _storage._defaultFloat ?? (alwaysVisitPrimitiveFields ? 51.5 : nil) { + try { if let v = _storage._defaultFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 71) } }() - try { if let v = _storage._defaultDouble ?? (alwaysVisitPrimitiveFields ? 52000 : nil) { + try { if let v = _storage._defaultDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 72) } }() - try { if let v = _storage._defaultBool ?? (alwaysVisitPrimitiveFields ? true : nil) { + try { if let v = _storage._defaultBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 73) } }() - try { if let v = _storage._defaultString ?? (alwaysVisitPrimitiveFields ? "hello" : nil) { + try { if let v = _storage._defaultString { try visitor.visitSingularStringField(value: v, fieldNumber: 74) } }() - try { if let v = _storage._defaultBytes ?? (alwaysVisitPrimitiveFields ? Data([119, 111, 114, 108, 100]) : nil) { + try { if let v = _storage._defaultBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 75) } }() - try { if let v = _storage._defaultNestedEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_TestAllRequiredTypes.NestedEnum.bar : nil) { + try { if let v = _storage._defaultNestedEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 81) } }() - try { if let v = _storage._defaultForeignEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_ForeignEnum.foreignBar : nil) { + try { if let v = _storage._defaultForeignEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 82) } }() - try { if let v = _storage._defaultImportEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Import_ImportEnum.importBar : nil) { + try { if let v = _storage._defaultImportEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 83) } }() - try { if let v = _storage._defaultStringPiece ?? (alwaysVisitPrimitiveFields ? "abc" : nil) { + try { if let v = _storage._defaultStringPiece { try visitor.visitSingularStringField(value: v, fieldNumber: 84) } }() - try { if let v = _storage._defaultCord ?? (alwaysVisitPrimitiveFields ? "123" : nil) { + try { if let v = _storage._defaultCord { try visitor.visitSingularStringField(value: v, fieldNumber: 85) } }() switch _storage._oneofField { @@ -1292,12 +1291,11 @@ extension SwiftProtoTesting_TestAllRequiredTypes.NestedMessage: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bb ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bb { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -1334,12 +1332,11 @@ extension SwiftProtoTesting_TestAllRequiredTypes.RequiredGroup: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 17) } }() try unknownFields.traverse(visitor: &visitor) @@ -1391,27 +1388,26 @@ extension SwiftProtoTesting_TestSomeRequiredTypes: SwiftProtobuf.Message, SwiftP } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._requiredInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requiredInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._requiredFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requiredFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 2) } }() - try { if let v = self._requiredBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = self._requiredBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 3) } }() - try { if let v = self._requiredString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._requiredString { try visitor.visitSingularStringField(value: v, fieldNumber: 4) } }() - try { if let v = self._requiredBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = self._requiredBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 5) } }() - try { if let v = self._requiredNestedEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_TestSomeRequiredTypes.NestedEnum.foo : nil) { + try { if let v = self._requiredNestedEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 6) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_deprecated.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_deprecated.pb.swift index d67f77898..16266836d 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_deprecated.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_deprecated.pb.swift @@ -506,10 +506,10 @@ extension SwiftProtoTesting_Deprecated_MyMsg: SwiftProtobuf.Message, SwiftProtob // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._stringField ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._stringField { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = _storage._intField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._intField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() if !_storage._fixedField.isEmpty || alwaysVisitPrimitiveFields { @@ -628,10 +628,10 @@ extension SwiftProtoTesting_Deprecated_MyMsg2: SwiftProtobuf.Message, SwiftProto // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._stringField ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._stringField { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() - try { if let v = _storage._intField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._intField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() if !_storage._fixedField.isEmpty || alwaysVisitPrimitiveFields { diff --git a/Tests/SwiftProtobufTests/unittest_swift_deprecated_file.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_deprecated_file.pb.swift index 65c77be9a..2293bc61c 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_deprecated_file.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_deprecated_file.pb.swift @@ -342,12 +342,11 @@ extension SwiftProtoTesting_DeprecatedFile_MyMsg: SwiftProtobuf.Message, SwiftPr } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._stringField ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._stringField { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 100, end: 536870912) diff --git a/Tests/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift index e3ac98bd8..cbe96f5c0 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_enum_optional_default.pb.swift @@ -213,7 +213,6 @@ extension SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage: SwiftProto } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations @@ -222,7 +221,7 @@ extension SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage: SwiftProto try { if let v = _storage._message { try visitor.visitSingularMessageField(value: v, fieldNumber: 1) } }() - try { if let v = _storage._optionalEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage.Enum.foo : nil) { + try { if let v = _storage._optionalEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 17) } }() } @@ -270,12 +269,11 @@ extension SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage2: SwiftProt } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._optionalEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Extend_EnumOptionalDefault.NestedMessage2.Enum.foo : nil) { + try { if let v = self._optionalEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 17) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_extension.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_extension.pb.swift index b6d59c89b..dc9301b71 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_extension.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_extension.pb.swift @@ -473,12 +473,11 @@ extension SwiftProtoTesting_Extend_Foo.Bar.Baz: SwiftProtobuf.Message, SwiftProt } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 100, end: 1001) @@ -512,12 +511,11 @@ extension SwiftProtoTesting_Extend_C: SwiftProtobuf.Message, SwiftProtobuf._Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt64Field(value: v, fieldNumber: 999) } }() try unknownFields.traverse(visitor: &visitor) @@ -614,12 +612,11 @@ extension SwiftProtoTesting_Extend_MsgNoStorage: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._x ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._x { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 100, end: 201) @@ -689,13 +686,12 @@ extension SwiftProtoTesting_Extend_MsgUsesStorage: SwiftProtobuf.Message, SwiftP } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._x ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._x { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try { if let v = _storage._y { diff --git a/Tests/SwiftProtobufTests/unittest_swift_extension2.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_extension2.pb.swift index 9d2741a08..b05ac66f9 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_extension2.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_extension2.pb.swift @@ -246,12 +246,11 @@ extension SwiftProtoTesting_Extend2_MyMessage.C: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1210) } }() try unknownFields.traverse(visitor: &visitor) @@ -283,12 +282,11 @@ extension SwiftProtoTesting_Extend2_C: SwiftProtobuf.Message, SwiftProtobuf._Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1220) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_extension3.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_extension3.pb.swift index b0b3f5bd0..29e965d11 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_extension3.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_extension3.pb.swift @@ -246,12 +246,11 @@ extension SwiftProtoTesting_Extend3_MyMessage.C: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1310) } }() try unknownFields.traverse(visitor: &visitor) @@ -283,12 +282,11 @@ extension SwiftProtoTesting_Extend3_C: SwiftProtobuf.Message, SwiftProtobuf._Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1320) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_extension4.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_extension4.pb.swift index cf20551af..2a784fb10 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_extension4.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_extension4.pb.swift @@ -246,12 +246,11 @@ extension Ext4MyMessage.C: SwiftProtobuf.Message, SwiftProtobuf._MessageImplemen } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1410) } }() try unknownFields.traverse(visitor: &visitor) @@ -283,12 +282,11 @@ extension Ext4C: SwiftProtobuf.Message, SwiftProtobuf._MessageImplementationBase } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1420) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_fieldorder.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_fieldorder.pb.swift index ac844ef69..ab4754d5f 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_fieldorder.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_fieldorder.pb.swift @@ -430,12 +430,11 @@ extension SwiftProtoTesting_Order_TestFieldOrderings: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._myInt ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._myInt { try visitor.visitSingularInt64Field(value: v, fieldNumber: 1) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 2, end: 9) @@ -450,14 +449,14 @@ extension SwiftProtoTesting_Order_TestFieldOrderings: SwiftProtobuf.Message, Swi }() default: break } - try { if let v = self._myString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._myString { try visitor.visitSingularStringField(value: v, fieldNumber: 11) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 12, end: 56) try { if case .oneofInt64(let v)? = self.options { try visitor.visitSingularInt64Field(value: v, fieldNumber: 60) } }() - try { if let v = self._myFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._myFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 101) } }() try { if case .oneofString(let v)? = self.options { @@ -502,15 +501,14 @@ extension SwiftProtoTesting_Order_TestFieldOrderings.NestedMessage: SwiftProtobu } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bb ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bb { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._oo ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._oo { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() try unknownFields.traverse(visitor: &visitor) @@ -622,7 +620,6 @@ extension SwiftProtoTesting_Order_OneofTraversalGeneration: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and @@ -641,7 +638,7 @@ extension SwiftProtoTesting_Order_OneofTraversalGeneration: SwiftProtobuf.Messag try { if case .a2(let v)? = self.oConflictField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 101) } }() - try { if let v = self._m ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._m { try visitor.visitSingularInt32Field(value: v, fieldNumber: 113) } }() try { if case .b2(let v)? = self.oConflictField { diff --git a/Tests/SwiftProtobufTests/unittest_swift_groups.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_groups.pb.swift index 3f93a4e07..ad2322d49 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_groups.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_groups.pb.swift @@ -351,12 +351,11 @@ extension SwiftTestGroupExtensions: SwiftProtobuf.Message, SwiftProtobuf._Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try visitor.visitExtensionFields(fields: _protobuf_extensionFieldValues, start: 2, end: 11) @@ -390,12 +389,11 @@ extension ExtensionGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageImplement } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -427,12 +425,11 @@ extension RepeatedExtensionGroup: SwiftProtobuf.Message, SwiftProtobuf._MessageI } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -464,12 +461,11 @@ extension SwiftTestGroupUnextended: SwiftProtobuf.Message, SwiftProtobuf._Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -510,7 +506,7 @@ extension SwiftTestNestingGroupsMessage: SwiftProtobuf.Message, SwiftProtobuf._M // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._outerA ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._outerA { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try { if let v = self._subGroup1 { @@ -552,12 +548,11 @@ extension SwiftTestNestingGroupsMessage.SubGroup1: SwiftProtobuf.Message, SwiftP } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._sub1A ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._sub1A { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try { if let v = self._subGroup2 { @@ -593,12 +588,11 @@ extension SwiftTestNestingGroupsMessage.SubGroup1.SubGroup2: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._sub2A ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._sub2A { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -637,7 +631,7 @@ extension SwiftTestNestingGroupsMessage.SubGroup3: SwiftProtobuf.Message, SwiftP // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._sub3A ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._sub3A { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() if !self.subGroup4.isEmpty || alwaysVisitPrimitiveFields { @@ -673,12 +667,11 @@ extension SwiftTestNestingGroupsMessage.SubGroup3.SubGroup4: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._sub4A ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._sub4A { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_naming.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_naming.pb.swift index 0ca4a62ab..64895f7ab 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_naming.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_naming.pb.swift @@ -16320,676 +16320,675 @@ extension SwiftProtoTesting_Names_FieldNames: SwiftProtobuf.Message, SwiftProtob } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._string ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._string { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._int ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._int { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._double ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._double { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._float ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._float { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._uint ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._uint { try visitor.visitSingularInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._hashValue_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._hashValue_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._description_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._description_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._debugDescription_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._debugDescription_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._swift ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._swift { try visitor.visitSingularInt32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._unrecognized ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._unrecognized { try visitor.visitSingularInt32Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._class ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._class { try visitor.visitSingularInt32Field(value: v, fieldNumber: 11) } }() - try { if let v = _storage._deinit ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._deinit { try visitor.visitSingularInt32Field(value: v, fieldNumber: 12) } }() - try { if let v = _storage._enum ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._enum { try visitor.visitSingularInt32Field(value: v, fieldNumber: 13) } }() - try { if let v = _storage._func ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._func { try visitor.visitSingularInt32Field(value: v, fieldNumber: 15) } }() - try { if let v = _storage._import ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._import { try visitor.visitSingularInt32Field(value: v, fieldNumber: 16) } }() - try { if let v = _storage._init_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._init_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 17) } }() - try { if let v = _storage._inout ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._inout { try visitor.visitSingularInt32Field(value: v, fieldNumber: 18) } }() - try { if let v = _storage._internal ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._internal { try visitor.visitSingularInt32Field(value: v, fieldNumber: 19) } }() - try { if let v = _storage._let ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._let { try visitor.visitSingularInt32Field(value: v, fieldNumber: 20) } }() - try { if let v = _storage._operator ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._operator { try visitor.visitSingularInt32Field(value: v, fieldNumber: 21) } }() - try { if let v = _storage._private ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._private { try visitor.visitSingularInt32Field(value: v, fieldNumber: 22) } }() - try { if let v = _storage._protocol ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._protocol { try visitor.visitSingularInt32Field(value: v, fieldNumber: 23) } }() - try { if let v = _storage._public ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._public { try visitor.visitSingularInt32Field(value: v, fieldNumber: 24) } }() - try { if let v = _storage._static ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._static { try visitor.visitSingularInt32Field(value: v, fieldNumber: 25) } }() - try { if let v = _storage._struct ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._struct { try visitor.visitSingularInt32Field(value: v, fieldNumber: 26) } }() - try { if let v = _storage._subscript ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._subscript { try visitor.visitSingularInt32Field(value: v, fieldNumber: 27) } }() - try { if let v = _storage._typealias ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._typealias { try visitor.visitSingularInt32Field(value: v, fieldNumber: 28) } }() - try { if let v = _storage._var ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._var { try visitor.visitSingularInt32Field(value: v, fieldNumber: 29) } }() - try { if let v = _storage._break ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._break { try visitor.visitSingularInt32Field(value: v, fieldNumber: 30) } }() - try { if let v = _storage._case ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._case { try visitor.visitSingularInt32Field(value: v, fieldNumber: 31) } }() - try { if let v = _storage._continue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._continue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 32) } }() - try { if let v = _storage._default ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._default { try visitor.visitSingularInt32Field(value: v, fieldNumber: 33) } }() - try { if let v = _storage._defer ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._defer { try visitor.visitSingularInt32Field(value: v, fieldNumber: 34) } }() - try { if let v = _storage._do ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._do { try visitor.visitSingularInt32Field(value: v, fieldNumber: 35) } }() - try { if let v = _storage._else ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._else { try visitor.visitSingularInt32Field(value: v, fieldNumber: 36) } }() - try { if let v = _storage._fallthrough ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fallthrough { try visitor.visitSingularInt32Field(value: v, fieldNumber: 37) } }() - try { if let v = _storage._for ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._for { try visitor.visitSingularInt32Field(value: v, fieldNumber: 38) } }() - try { if let v = _storage._guard ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._guard { try visitor.visitSingularInt32Field(value: v, fieldNumber: 39) } }() - try { if let v = _storage._if ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._if { try visitor.visitSingularInt32Field(value: v, fieldNumber: 40) } }() - try { if let v = _storage._in ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._in { try visitor.visitSingularInt32Field(value: v, fieldNumber: 41) } }() - try { if let v = _storage._repeat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._repeat { try visitor.visitSingularInt32Field(value: v, fieldNumber: 42) } }() - try { if let v = _storage._return ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._return { try visitor.visitSingularInt32Field(value: v, fieldNumber: 43) } }() - try { if let v = _storage._switch ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._switch { try visitor.visitSingularInt32Field(value: v, fieldNumber: 44) } }() - try { if let v = _storage._where ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._where { try visitor.visitSingularInt32Field(value: v, fieldNumber: 45) } }() - try { if let v = _storage._while ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._while { try visitor.visitSingularInt32Field(value: v, fieldNumber: 46) } }() - try { if let v = _storage._as ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._as { try visitor.visitSingularInt32Field(value: v, fieldNumber: 47) } }() - try { if let v = _storage._catch ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._catch { try visitor.visitSingularInt32Field(value: v, fieldNumber: 48) } }() - try { if let v = _storage._dynamicType_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dynamicType_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 49) } }() - try { if let v = _storage._false ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._false { try visitor.visitSingularInt32Field(value: v, fieldNumber: 50) } }() - try { if let v = _storage._is ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._is { try visitor.visitSingularInt32Field(value: v, fieldNumber: 51) } }() - try { if let v = _storage._nil ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._nil { try visitor.visitSingularInt32Field(value: v, fieldNumber: 52) } }() - try { if let v = _storage._rethrows ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._rethrows { try visitor.visitSingularInt32Field(value: v, fieldNumber: 53) } }() - try { if let v = _storage._super ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._super { try visitor.visitSingularInt32Field(value: v, fieldNumber: 54) } }() - try { if let v = _storage._self_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._self_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 55) } }() - try { if let v = _storage._throw ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._throw { try visitor.visitSingularInt32Field(value: v, fieldNumber: 57) } }() - try { if let v = _storage._throws ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._throws { try visitor.visitSingularInt32Field(value: v, fieldNumber: 58) } }() - try { if let v = _storage._true ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._true { try visitor.visitSingularInt32Field(value: v, fieldNumber: 59) } }() - try { if let v = _storage._try ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._try { try visitor.visitSingularInt32Field(value: v, fieldNumber: 60) } }() - try { if let v = _storage.__Column__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage.__Column__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 61) } }() - try { if let v = _storage.__File__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage.__File__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 62) } }() - try { if let v = _storage.__Function__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage.__Function__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 63) } }() - try { if let v = _storage.__Line__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage.__Line__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 64) } }() - try { if let v = _storage.____ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage.____ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 65) } }() - try { if let v = _storage._associativity ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._associativity { try visitor.visitSingularInt32Field(value: v, fieldNumber: 66) } }() - try { if let v = _storage._convenience ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._convenience { try visitor.visitSingularInt32Field(value: v, fieldNumber: 67) } }() - try { if let v = _storage._dynamic ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dynamic { try visitor.visitSingularInt32Field(value: v, fieldNumber: 68) } }() - try { if let v = _storage._didSet ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._didSet { try visitor.visitSingularInt32Field(value: v, fieldNumber: 69) } }() - try { if let v = _storage._final ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._final { try visitor.visitSingularInt32Field(value: v, fieldNumber: 70) } }() - try { if let v = _storage._get ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._get { try visitor.visitSingularInt32Field(value: v, fieldNumber: 71) } }() - try { if let v = _storage._infix ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._infix { try visitor.visitSingularInt32Field(value: v, fieldNumber: 72) } }() - try { if let v = _storage._indirect ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._indirect { try visitor.visitSingularInt32Field(value: v, fieldNumber: 73) } }() - try { if let v = _storage._lazy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._lazy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 74) } }() - try { if let v = _storage._left ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._left { try visitor.visitSingularInt32Field(value: v, fieldNumber: 75) } }() - try { if let v = _storage._mutating ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._mutating { try visitor.visitSingularInt32Field(value: v, fieldNumber: 76) } }() - try { if let v = _storage._none ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._none { try visitor.visitSingularInt32Field(value: v, fieldNumber: 77) } }() - try { if let v = _storage._nonmutating ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._nonmutating { try visitor.visitSingularInt32Field(value: v, fieldNumber: 78) } }() - try { if let v = _storage._optional ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optional { try visitor.visitSingularInt32Field(value: v, fieldNumber: 79) } }() - try { if let v = _storage._override ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._override { try visitor.visitSingularInt32Field(value: v, fieldNumber: 80) } }() - try { if let v = _storage._postfix ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._postfix { try visitor.visitSingularInt32Field(value: v, fieldNumber: 81) } }() - try { if let v = _storage._precedence ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._precedence { try visitor.visitSingularInt32Field(value: v, fieldNumber: 82) } }() - try { if let v = _storage._prefix ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._prefix { try visitor.visitSingularInt32Field(value: v, fieldNumber: 83) } }() - try { if let v = _storage._required ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._required { try visitor.visitSingularInt32Field(value: v, fieldNumber: 85) } }() - try { if let v = _storage._right ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._right { try visitor.visitSingularInt32Field(value: v, fieldNumber: 86) } }() - try { if let v = _storage._set ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._set { try visitor.visitSingularInt32Field(value: v, fieldNumber: 87) } }() - try { if let v = _storage._type ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._type { try visitor.visitSingularInt32Field(value: v, fieldNumber: 88) } }() - try { if let v = _storage._unowned ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._unowned { try visitor.visitSingularInt32Field(value: v, fieldNumber: 89) } }() - try { if let v = _storage._weak ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._weak { try visitor.visitSingularInt32Field(value: v, fieldNumber: 90) } }() - try { if let v = _storage._willSet ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._willSet { try visitor.visitSingularInt32Field(value: v, fieldNumber: 91) } }() - try { if let v = _storage._id ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._id { try visitor.visitSingularInt32Field(value: v, fieldNumber: 92) } }() - try { if let v = _storage._cmd ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._cmd { try visitor.visitSingularInt32Field(value: v, fieldNumber: 93) } }() - try { if let v = _storage._out ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._out { try visitor.visitSingularInt32Field(value: v, fieldNumber: 96) } }() - try { if let v = _storage._bycopy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._bycopy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 98) } }() - try { if let v = _storage._byref ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._byref { try visitor.visitSingularInt32Field(value: v, fieldNumber: 99) } }() - try { if let v = _storage._oneway ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._oneway { try visitor.visitSingularInt32Field(value: v, fieldNumber: 100) } }() - try { if let v = _storage._and ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._and { try visitor.visitSingularInt32Field(value: v, fieldNumber: 102) } }() - try { if let v = _storage._andEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._andEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 103) } }() - try { if let v = _storage._alignas ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._alignas { try visitor.visitSingularInt32Field(value: v, fieldNumber: 104) } }() - try { if let v = _storage._alignof ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._alignof { try visitor.visitSingularInt32Field(value: v, fieldNumber: 105) } }() - try { if let v = _storage._asm ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._asm { try visitor.visitSingularInt32Field(value: v, fieldNumber: 106) } }() - try { if let v = _storage._auto ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._auto { try visitor.visitSingularInt32Field(value: v, fieldNumber: 107) } }() - try { if let v = _storage._bitand ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._bitand { try visitor.visitSingularInt32Field(value: v, fieldNumber: 108) } }() - try { if let v = _storage._bitor ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._bitor { try visitor.visitSingularInt32Field(value: v, fieldNumber: 109) } }() - try { if let v = _storage._bool ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._bool { try visitor.visitSingularInt32Field(value: v, fieldNumber: 110) } }() - try { if let v = _storage._char ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._char { try visitor.visitSingularInt32Field(value: v, fieldNumber: 114) } }() - try { if let v = _storage._char16T ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._char16T { try visitor.visitSingularInt32Field(value: v, fieldNumber: 115) } }() - try { if let v = _storage._char32T ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._char32T { try visitor.visitSingularInt32Field(value: v, fieldNumber: 116) } }() - try { if let v = _storage._compl ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._compl { try visitor.visitSingularInt32Field(value: v, fieldNumber: 118) } }() - try { if let v = _storage._const ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._const { try visitor.visitSingularInt32Field(value: v, fieldNumber: 119) } }() - try { if let v = _storage._constexpr ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._constexpr { try visitor.visitSingularInt32Field(value: v, fieldNumber: 120) } }() - try { if let v = _storage._constCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._constCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 121) } }() - try { if let v = _storage._decltype ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._decltype { try visitor.visitSingularInt32Field(value: v, fieldNumber: 123) } }() - try { if let v = _storage._delete ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._delete { try visitor.visitSingularInt32Field(value: v, fieldNumber: 125) } }() - try { if let v = _storage._dynamicCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dynamicCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 127) } }() - try { if let v = _storage._explicit ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._explicit { try visitor.visitSingularInt32Field(value: v, fieldNumber: 130) } }() - try { if let v = _storage._export ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._export { try visitor.visitSingularInt32Field(value: v, fieldNumber: 131) } }() - try { if let v = _storage._extern ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._extern { try visitor.visitSingularInt32Field(value: v, fieldNumber: 132) } }() - try { if let v = _storage._friend ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._friend { try visitor.visitSingularInt32Field(value: v, fieldNumber: 136) } }() - try { if let v = _storage._goto ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._goto { try visitor.visitSingularInt32Field(value: v, fieldNumber: 137) } }() - try { if let v = _storage._inline ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._inline { try visitor.visitSingularInt32Field(value: v, fieldNumber: 139) } }() - try { if let v = _storage._long ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._long { try visitor.visitSingularInt32Field(value: v, fieldNumber: 141) } }() - try { if let v = _storage._mutable ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._mutable { try visitor.visitSingularInt32Field(value: v, fieldNumber: 142) } }() - try { if let v = _storage._namespace ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._namespace { try visitor.visitSingularInt32Field(value: v, fieldNumber: 143) } }() - try { if let v = _storage._new ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._new { try visitor.visitSingularInt32Field(value: v, fieldNumber: 144) } }() - try { if let v = _storage._noexcept ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._noexcept { try visitor.visitSingularInt32Field(value: v, fieldNumber: 145) } }() - try { if let v = _storage._not ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._not { try visitor.visitSingularInt32Field(value: v, fieldNumber: 146) } }() - try { if let v = _storage._notEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._notEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 147) } }() - try { if let v = _storage._nullptr ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._nullptr { try visitor.visitSingularInt32Field(value: v, fieldNumber: 148) } }() - try { if let v = _storage._or ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._or { try visitor.visitSingularInt32Field(value: v, fieldNumber: 150) } }() - try { if let v = _storage._orEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._orEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 151) } }() - try { if let v = _storage._protected ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._protected { try visitor.visitSingularInt32Field(value: v, fieldNumber: 153) } }() - try { if let v = _storage._register ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._register { try visitor.visitSingularInt32Field(value: v, fieldNumber: 155) } }() - try { if let v = _storage._reinterpretCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._reinterpretCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 156) } }() - try { if let v = _storage._short ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._short { try visitor.visitSingularInt32Field(value: v, fieldNumber: 158) } }() - try { if let v = _storage._signed ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._signed { try visitor.visitSingularInt32Field(value: v, fieldNumber: 159) } }() - try { if let v = _storage._sizeof ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._sizeof { try visitor.visitSingularInt32Field(value: v, fieldNumber: 160) } }() - try { if let v = _storage._staticAssert ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._staticAssert { try visitor.visitSingularInt32Field(value: v, fieldNumber: 162) } }() - try { if let v = _storage._staticCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._staticCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 163) } }() - try { if let v = _storage._template ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._template { try visitor.visitSingularInt32Field(value: v, fieldNumber: 166) } }() - try { if let v = _storage._this ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._this { try visitor.visitSingularInt32Field(value: v, fieldNumber: 167) } }() - try { if let v = _storage._threadLocal ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._threadLocal { try visitor.visitSingularInt32Field(value: v, fieldNumber: 168) } }() - try { if let v = _storage._typedef ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._typedef { try visitor.visitSingularInt32Field(value: v, fieldNumber: 172) } }() - try { if let v = _storage._typeid ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._typeid { try visitor.visitSingularInt32Field(value: v, fieldNumber: 173) } }() - try { if let v = _storage._typename ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._typename { try visitor.visitSingularInt32Field(value: v, fieldNumber: 174) } }() - try { if let v = _storage._union ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._union { try visitor.visitSingularInt32Field(value: v, fieldNumber: 175) } }() - try { if let v = _storage._unsigned ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._unsigned { try visitor.visitSingularInt32Field(value: v, fieldNumber: 176) } }() - try { if let v = _storage._using ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._using { try visitor.visitSingularInt32Field(value: v, fieldNumber: 177) } }() - try { if let v = _storage._virtual ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._virtual { try visitor.visitSingularInt32Field(value: v, fieldNumber: 178) } }() - try { if let v = _storage._void ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._void { try visitor.visitSingularInt32Field(value: v, fieldNumber: 179) } }() - try { if let v = _storage._volatile ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._volatile { try visitor.visitSingularInt32Field(value: v, fieldNumber: 180) } }() - try { if let v = _storage._wcharT ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._wcharT { try visitor.visitSingularInt32Field(value: v, fieldNumber: 181) } }() - try { if let v = _storage._xor ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._xor { try visitor.visitSingularInt32Field(value: v, fieldNumber: 183) } }() - try { if let v = _storage._xorEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._xorEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 184) } }() - try { if let v = _storage._restrict ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._restrict { try visitor.visitSingularInt32Field(value: v, fieldNumber: 185) } }() - try { if let v = _storage._category ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._category { try visitor.visitSingularInt32Field(value: v, fieldNumber: 186) } }() - try { if let v = _storage._ivar ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._ivar { try visitor.visitSingularInt32Field(value: v, fieldNumber: 187) } }() - try { if let v = _storage._method ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._method { try visitor.visitSingularInt32Field(value: v, fieldNumber: 188) } }() - try { if let v = _storage._finalize ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._finalize { try visitor.visitSingularInt32Field(value: v, fieldNumber: 192) } }() - try { if let v = _storage._hash ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._hash { try visitor.visitSingularInt32Field(value: v, fieldNumber: 193) } }() - try { if let v = _storage._dealloc ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._dealloc { try visitor.visitSingularInt32Field(value: v, fieldNumber: 194) } }() - try { if let v = _storage._superclass ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._superclass { try visitor.visitSingularInt32Field(value: v, fieldNumber: 197) } }() - try { if let v = _storage._retain ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._retain { try visitor.visitSingularInt32Field(value: v, fieldNumber: 198) } }() - try { if let v = _storage._release ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._release { try visitor.visitSingularInt32Field(value: v, fieldNumber: 199) } }() - try { if let v = _storage._autorelease ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._autorelease { try visitor.visitSingularInt32Field(value: v, fieldNumber: 200) } }() - try { if let v = _storage._retainCount ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._retainCount { try visitor.visitSingularInt32Field(value: v, fieldNumber: 201) } }() - try { if let v = _storage._zone ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._zone { try visitor.visitSingularInt32Field(value: v, fieldNumber: 202) } }() - try { if let v = _storage._isProxy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._isProxy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 203) } }() - try { if let v = _storage._copy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._copy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 204) } }() - try { if let v = _storage._mutableCopy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._mutableCopy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 205) } }() - try { if let v = _storage._classForCoder ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._classForCoder { try visitor.visitSingularInt32Field(value: v, fieldNumber: 206) } }() - try { if let v = _storage._clear ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._clear { try visitor.visitSingularInt32Field(value: v, fieldNumber: 207) } }() - try { if let v = _storage._data ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._data { try visitor.visitSingularInt32Field(value: v, fieldNumber: 208) } }() - try { if let v = _storage._delimitedData ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._delimitedData { try visitor.visitSingularInt32Field(value: v, fieldNumber: 209) } }() - try { if let v = _storage._descriptor ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._descriptor { try visitor.visitSingularInt32Field(value: v, fieldNumber: 210) } }() - try { if let v = _storage._extensionRegistry ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._extensionRegistry { try visitor.visitSingularInt32Field(value: v, fieldNumber: 211) } }() - try { if let v = _storage._extensionsCurrentlySet ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._extensionsCurrentlySet { try visitor.visitSingularInt32Field(value: v, fieldNumber: 212) } }() - try { if let v = _storage._isInitialized_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._isInitialized_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 213) } }() - try { if let v = _storage._serializedSize ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._serializedSize { try visitor.visitSingularInt32Field(value: v, fieldNumber: 214) } }() - try { if let v = _storage._sortedExtensionsInUse ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._sortedExtensionsInUse { try visitor.visitSingularInt32Field(value: v, fieldNumber: 215) } }() - try { if let v = _storage._unknownFields_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._unknownFields_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 216) } }() - try { if let v = _storage._fixed ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fixed { try visitor.visitSingularInt32Field(value: v, fieldNumber: 217) } }() - try { if let v = _storage._fract ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fract { try visitor.visitSingularInt32Field(value: v, fieldNumber: 218) } }() - try { if let v = _storage._size ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._size { try visitor.visitSingularInt32Field(value: v, fieldNumber: 219) } }() - try { if let v = _storage._logicalAddress ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._logicalAddress { try visitor.visitSingularInt32Field(value: v, fieldNumber: 220) } }() - try { if let v = _storage._physicalAddress ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._physicalAddress { try visitor.visitSingularInt32Field(value: v, fieldNumber: 221) } }() - try { if let v = _storage._byteCount ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._byteCount { try visitor.visitSingularInt32Field(value: v, fieldNumber: 222) } }() - try { if let v = _storage._byteOffset ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._byteOffset { try visitor.visitSingularInt32Field(value: v, fieldNumber: 223) } }() - try { if let v = _storage._duration ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._duration { try visitor.visitSingularInt32Field(value: v, fieldNumber: 224) } }() - try { if let v = _storage._absoluteTime ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._absoluteTime { try visitor.visitSingularInt32Field(value: v, fieldNumber: 225) } }() - try { if let v = _storage._optionBits ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionBits { try visitor.visitSingularInt32Field(value: v, fieldNumber: 226) } }() - try { if let v = _storage._itemCount ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._itemCount { try visitor.visitSingularInt32Field(value: v, fieldNumber: 227) } }() - try { if let v = _storage._pbversion ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._pbversion { try visitor.visitSingularInt32Field(value: v, fieldNumber: 228) } }() - try { if let v = _storage._scriptCode ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._scriptCode { try visitor.visitSingularInt32Field(value: v, fieldNumber: 229) } }() - try { if let v = _storage._langCode ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._langCode { try visitor.visitSingularInt32Field(value: v, fieldNumber: 230) } }() - try { if let v = _storage._regionCode ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._regionCode { try visitor.visitSingularInt32Field(value: v, fieldNumber: 231) } }() - try { if let v = _storage._ostype ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._ostype { try visitor.visitSingularInt32Field(value: v, fieldNumber: 232) } }() - try { if let v = _storage._processSerialNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._processSerialNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 233) } }() - try { if let v = _storage._point ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._point { try visitor.visitSingularInt32Field(value: v, fieldNumber: 234) } }() - try { if let v = _storage._rect ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._rect { try visitor.visitSingularInt32Field(value: v, fieldNumber: 235) } }() - try { if let v = _storage._fixedPoint ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fixedPoint { try visitor.visitSingularInt32Field(value: v, fieldNumber: 236) } }() - try { if let v = _storage._fixedRect ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fixedRect { try visitor.visitSingularInt32Field(value: v, fieldNumber: 237) } }() - try { if let v = _storage._style ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._style { try visitor.visitSingularInt32Field(value: v, fieldNumber: 238) } }() - try { if let v = _storage._styleParameter ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._styleParameter { try visitor.visitSingularInt32Field(value: v, fieldNumber: 239) } }() - try { if let v = _storage._styleField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._styleField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 240) } }() - try { if let v = _storage._timeScale ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._timeScale { try visitor.visitSingularInt32Field(value: v, fieldNumber: 241) } }() - try { if let v = _storage._timeBase ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._timeBase { try visitor.visitSingularInt32Field(value: v, fieldNumber: 242) } }() - try { if let v = _storage._timeRecord ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._timeRecord { try visitor.visitSingularInt32Field(value: v, fieldNumber: 243) } }() - try { if let v = _storage._jsonShouldBeOverridden ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._jsonShouldBeOverridden { try visitor.visitSingularInt32Field(value: v, fieldNumber: 244) } }() - try { if let v = _storage._any ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._any { try visitor.visitSingularInt32Field(value: v, fieldNumber: 245) } }() - try { if let v = _storage._int32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._int32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 246) } }() - try { if let v = _storage._int64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._int64 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 247) } }() - try { if let v = _storage._uint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._uint32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 250) } }() - try { if let v = _storage._uint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._uint64 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 251) } }() - try { if let v = _storage._associatedtype ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._associatedtype { try visitor.visitSingularInt32Field(value: v, fieldNumber: 252) } }() - try { if let v = _storage._fileprivate ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._fileprivate { try visitor.visitSingularInt32Field(value: v, fieldNumber: 253) } }() - try { if let v = _storage._open ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._open { try visitor.visitSingularInt32Field(value: v, fieldNumber: 254) } }() - try { if let v = _storage._serializedData ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._serializedData { try visitor.visitSingularInt32Field(value: v, fieldNumber: 255) } }() - try { if let v = _storage._hasSerializedData_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._hasSerializedData_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 256) } }() - try { if let v = _storage._clearSerializedData_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._clearSerializedData_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 257) } }() - try { if let v = _storage._jsonUtf8Data ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._jsonUtf8Data { try visitor.visitSingularInt32Field(value: v, fieldNumber: 258) } }() - try { if let v = _storage._jsonString ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._jsonString { try visitor.visitSingularInt32Field(value: v, fieldNumber: 259) } }() - try { if let v = _storage._extension ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._extension { try visitor.visitSingularInt32Field(value: v, fieldNumber: 260) } }() - try { if let v = _storage._extensions ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._extensions { try visitor.visitSingularInt32Field(value: v, fieldNumber: 261) } }() } @@ -17270,12 +17269,11 @@ extension SwiftProtoTesting_Names_MessageNames.StringMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._string ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._string { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17307,12 +17305,11 @@ extension SwiftProtoTesting_Names_MessageNames.ProtocolMessage: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._protocol ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._protocol { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17344,12 +17341,11 @@ extension SwiftProtoTesting_Names_MessageNames.IntMessage: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._int ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._int { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17381,12 +17377,11 @@ extension SwiftProtoTesting_Names_MessageNames.DoubleMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._double ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._double { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17418,12 +17413,11 @@ extension SwiftProtoTesting_Names_MessageNames.FloatMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._float ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._float { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17455,12 +17449,11 @@ extension SwiftProtoTesting_Names_MessageNames.UIntMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._uint ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._uint { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17492,12 +17485,11 @@ extension SwiftProtoTesting_Names_MessageNames.hashValueMessage: SwiftProtobuf.M } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._hashValue_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._hashValue_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17529,12 +17521,11 @@ extension SwiftProtoTesting_Names_MessageNames.descriptionMessage: SwiftProtobuf } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._description_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._description_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17566,12 +17557,11 @@ extension SwiftProtoTesting_Names_MessageNames.debugDescriptionMessage: SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._debugDescription_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._debugDescription_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17603,12 +17593,11 @@ extension SwiftProtoTesting_Names_MessageNames.SwiftMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._swift ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._swift { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17640,12 +17629,11 @@ extension SwiftProtoTesting_Names_MessageNames.UNRECOGNIZED: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._unrecognized ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._unrecognized { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17677,12 +17665,11 @@ extension SwiftProtoTesting_Names_MessageNames.classMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._class ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._class { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17714,12 +17701,11 @@ extension SwiftProtoTesting_Names_MessageNames.deinitMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._deinit ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._deinit { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17751,12 +17737,11 @@ extension SwiftProtoTesting_Names_MessageNames.enumMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._enum ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._enum { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17788,12 +17773,11 @@ extension SwiftProtoTesting_Names_MessageNames.extensionMessage: SwiftProtobuf.M } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._extension ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._extension { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17825,12 +17809,11 @@ extension SwiftProtoTesting_Names_MessageNames.funcMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._func ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._func { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17862,12 +17845,11 @@ extension SwiftProtoTesting_Names_MessageNames.importMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._import ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._import { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17899,12 +17881,11 @@ extension SwiftProtoTesting_Names_MessageNames.initMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._init_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._init_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17936,12 +17917,11 @@ extension SwiftProtoTesting_Names_MessageNames.inoutMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._inout ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._inout { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -17973,12 +17953,11 @@ extension SwiftProtoTesting_Names_MessageNames.internalMessage: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._internal ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._internal { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18010,12 +17989,11 @@ extension SwiftProtoTesting_Names_MessageNames.letMessage: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._let ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._let { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18047,12 +18025,11 @@ extension SwiftProtoTesting_Names_MessageNames.operatorMessage: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._operator ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._operator { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18084,12 +18061,11 @@ extension SwiftProtoTesting_Names_MessageNames.privateMessage: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._private ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._private { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18121,12 +18097,11 @@ extension SwiftProtoTesting_Names_MessageNames.protocolMessage: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._protocol ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._protocol { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18158,12 +18133,11 @@ extension SwiftProtoTesting_Names_MessageNames.publicMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._public ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._public { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18195,12 +18169,11 @@ extension SwiftProtoTesting_Names_MessageNames.staticMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._static ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._static { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18232,12 +18205,11 @@ extension SwiftProtoTesting_Names_MessageNames.structMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._struct ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._struct { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18269,12 +18241,11 @@ extension SwiftProtoTesting_Names_MessageNames.subscriptMessage: SwiftProtobuf.M } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._subscript ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._subscript { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18306,12 +18277,11 @@ extension SwiftProtoTesting_Names_MessageNames.typealiasMessage: SwiftProtobuf.M } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._typealias ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._typealias { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18343,12 +18313,11 @@ extension SwiftProtoTesting_Names_MessageNames.varMessage: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._var ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._var { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18380,12 +18349,11 @@ extension SwiftProtoTesting_Names_MessageNames.breakMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._break ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._break { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18417,12 +18385,11 @@ extension SwiftProtoTesting_Names_MessageNames.caseMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._case ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._case { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18454,12 +18421,11 @@ extension SwiftProtoTesting_Names_MessageNames.continueMessage: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._continue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._continue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18491,12 +18457,11 @@ extension SwiftProtoTesting_Names_MessageNames.defaultMessage: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._default ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._default { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18528,12 +18493,11 @@ extension SwiftProtoTesting_Names_MessageNames.deferMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._defer ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._defer { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18565,12 +18529,11 @@ extension SwiftProtoTesting_Names_MessageNames.doMessage: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._do ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._do { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18602,12 +18565,11 @@ extension SwiftProtoTesting_Names_MessageNames.elseMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._else ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._else { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18639,12 +18601,11 @@ extension SwiftProtoTesting_Names_MessageNames.fallthroughMessage: SwiftProtobuf } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._fallthrough ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._fallthrough { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18676,12 +18637,11 @@ extension SwiftProtoTesting_Names_MessageNames.forMessage: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._for ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._for { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18713,12 +18673,11 @@ extension SwiftProtoTesting_Names_MessageNames.guardMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._guard ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._guard { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18750,12 +18709,11 @@ extension SwiftProtoTesting_Names_MessageNames.ifMessage: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._if ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._if { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18787,12 +18745,11 @@ extension SwiftProtoTesting_Names_MessageNames.inMessage: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._in ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._in { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18824,12 +18781,11 @@ extension SwiftProtoTesting_Names_MessageNames.repeatMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._repeat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._repeat { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18861,12 +18817,11 @@ extension SwiftProtoTesting_Names_MessageNames.returnMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._return ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._return { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18898,12 +18853,11 @@ extension SwiftProtoTesting_Names_MessageNames.switchMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._switch ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._switch { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18935,12 +18889,11 @@ extension SwiftProtoTesting_Names_MessageNames.whereMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._where ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._where { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -18972,12 +18925,11 @@ extension SwiftProtoTesting_Names_MessageNames.whileMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._while ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._while { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19009,12 +18961,11 @@ extension SwiftProtoTesting_Names_MessageNames.asMessage: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._as ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._as { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19046,12 +18997,11 @@ extension SwiftProtoTesting_Names_MessageNames.catchMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._catch ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._catch { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19083,12 +19033,11 @@ extension SwiftProtoTesting_Names_MessageNames.dynamicTypeMessage: SwiftProtobuf } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._dynamicType_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._dynamicType_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19120,12 +19069,11 @@ extension SwiftProtoTesting_Names_MessageNames.falseMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._false ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._false { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19157,12 +19105,11 @@ extension SwiftProtoTesting_Names_MessageNames.isMessage: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._is ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._is { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19194,12 +19141,11 @@ extension SwiftProtoTesting_Names_MessageNames.nilMessage: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._nil ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._nil { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19231,12 +19177,11 @@ extension SwiftProtoTesting_Names_MessageNames.rethrowsMessage: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._rethrows ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._rethrows { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19268,12 +19213,11 @@ extension SwiftProtoTesting_Names_MessageNames.superMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._super ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._super { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19305,12 +19249,11 @@ extension SwiftProtoTesting_Names_MessageNames.selfMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._self_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._self_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19342,12 +19285,11 @@ extension SwiftProtoTesting_Names_MessageNames.throwMessage: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._throw ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._throw { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19379,12 +19321,11 @@ extension SwiftProtoTesting_Names_MessageNames.throwsMessage: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._throws ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._throws { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19416,12 +19357,11 @@ extension SwiftProtoTesting_Names_MessageNames.trueMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._true ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._true { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19453,12 +19393,11 @@ extension SwiftProtoTesting_Names_MessageNames.tryMessage: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._try ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._try { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19490,12 +19429,11 @@ extension SwiftProtoTesting_Names_MessageNames.__COLUMN__Message: SwiftProtobuf. } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self.__Column__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self.__Column__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19527,12 +19465,11 @@ extension SwiftProtoTesting_Names_MessageNames.__FILE__Message: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self.__File__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self.__File__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19564,12 +19501,11 @@ extension SwiftProtoTesting_Names_MessageNames.__FUNCTION__Message: SwiftProtobu } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self.__Function__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self.__Function__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19601,12 +19537,11 @@ extension SwiftProtoTesting_Names_MessageNames.__LINE__Message: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self.__Line__ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self.__Line__ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19638,12 +19573,11 @@ extension SwiftProtoTesting_Names_MessageNames._Message: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self.____ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self.____ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19675,12 +19609,11 @@ extension SwiftProtoTesting_Names_MessageNames.__Message: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._____ ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._____ { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19712,12 +19645,11 @@ extension SwiftProtoTesting_Names_MessageNames.associativity: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._associativity ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._associativity { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19749,12 +19681,11 @@ extension SwiftProtoTesting_Names_MessageNames.convenience: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._convenience ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._convenience { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19786,12 +19717,11 @@ extension SwiftProtoTesting_Names_MessageNames.dynamic: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._dynamic ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._dynamic { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19823,12 +19753,11 @@ extension SwiftProtoTesting_Names_MessageNames.didSet: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._didSet ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._didSet { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19860,12 +19789,11 @@ extension SwiftProtoTesting_Names_MessageNames.final: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._final ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._final { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19897,12 +19825,11 @@ extension SwiftProtoTesting_Names_MessageNames.get: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._get ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._get { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19934,12 +19861,11 @@ extension SwiftProtoTesting_Names_MessageNames.infix: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._infix ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._infix { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -19971,12 +19897,11 @@ extension SwiftProtoTesting_Names_MessageNames.indirect: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._indirect ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._indirect { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20008,12 +19933,11 @@ extension SwiftProtoTesting_Names_MessageNames.lazy: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._lazy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._lazy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20045,12 +19969,11 @@ extension SwiftProtoTesting_Names_MessageNames.left: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._left ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._left { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20082,12 +20005,11 @@ extension SwiftProtoTesting_Names_MessageNames.mutating: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._mutating ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._mutating { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20119,12 +20041,11 @@ extension SwiftProtoTesting_Names_MessageNames.none: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._none ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._none { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20156,12 +20077,11 @@ extension SwiftProtoTesting_Names_MessageNames.nonmutating: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._nonmutating ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._nonmutating { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20193,12 +20113,11 @@ extension SwiftProtoTesting_Names_MessageNames.optional: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._optional ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._optional { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20230,12 +20149,11 @@ extension SwiftProtoTesting_Names_MessageNames.override: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._override ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._override { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20267,12 +20185,11 @@ extension SwiftProtoTesting_Names_MessageNames.postfix: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._postfix ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._postfix { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20304,12 +20221,11 @@ extension SwiftProtoTesting_Names_MessageNames.precedence: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._precedence ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._precedence { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20341,12 +20257,11 @@ extension SwiftProtoTesting_Names_MessageNames.prefix: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._prefix ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._prefix { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20378,12 +20293,11 @@ extension SwiftProtoTesting_Names_MessageNames.required: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._required ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._required { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20415,12 +20329,11 @@ extension SwiftProtoTesting_Names_MessageNames.right: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._right ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._right { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20452,12 +20365,11 @@ extension SwiftProtoTesting_Names_MessageNames.set: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._set ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._set { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20489,12 +20401,11 @@ extension SwiftProtoTesting_Names_MessageNames.TypeMessage: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._type ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._type { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20526,12 +20437,11 @@ extension SwiftProtoTesting_Names_MessageNames.unowned: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._unowned ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._unowned { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20563,12 +20473,11 @@ extension SwiftProtoTesting_Names_MessageNames.weak: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._weak ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._weak { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20600,12 +20509,11 @@ extension SwiftProtoTesting_Names_MessageNames.willSet: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._willSet ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._willSet { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20637,12 +20545,11 @@ extension SwiftProtoTesting_Names_MessageNames.id: SwiftProtobuf.Message, SwiftP } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._id ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._id { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20674,12 +20581,11 @@ extension SwiftProtoTesting_Names_MessageNames._cmd: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._cmd ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._cmd { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20711,12 +20617,11 @@ extension SwiftProtoTesting_Names_MessageNames.out: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._out ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._out { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20748,12 +20653,11 @@ extension SwiftProtoTesting_Names_MessageNames.bycopy: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bycopy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bycopy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20785,12 +20689,11 @@ extension SwiftProtoTesting_Names_MessageNames.byref: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._byref ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._byref { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20822,12 +20725,11 @@ extension SwiftProtoTesting_Names_MessageNames.oneway: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._oneway ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._oneway { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20859,12 +20761,11 @@ extension SwiftProtoTesting_Names_MessageNames.and: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._and ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._and { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20896,12 +20797,11 @@ extension SwiftProtoTesting_Names_MessageNames.and_eq: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._andEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._andEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20933,12 +20833,11 @@ extension SwiftProtoTesting_Names_MessageNames.alignas: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._alignas ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._alignas { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -20970,12 +20869,11 @@ extension SwiftProtoTesting_Names_MessageNames.alignof: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._alignof ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._alignof { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21007,12 +20905,11 @@ extension SwiftProtoTesting_Names_MessageNames.asm: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._asm ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._asm { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21044,12 +20941,11 @@ extension SwiftProtoTesting_Names_MessageNames.auto: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._auto ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._auto { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21081,12 +20977,11 @@ extension SwiftProtoTesting_Names_MessageNames.bitand: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bitand ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bitand { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21118,12 +21013,11 @@ extension SwiftProtoTesting_Names_MessageNames.bitor: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bitor ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bitor { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21155,12 +21049,11 @@ extension SwiftProtoTesting_Names_MessageNames.bool: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._bool ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._bool { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21192,12 +21085,11 @@ extension SwiftProtoTesting_Names_MessageNames.char: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._char ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._char { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21229,12 +21121,11 @@ extension SwiftProtoTesting_Names_MessageNames.char16_t: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._char16T ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._char16T { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21266,12 +21157,11 @@ extension SwiftProtoTesting_Names_MessageNames.char32_t: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._char32T ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._char32T { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21303,12 +21193,11 @@ extension SwiftProtoTesting_Names_MessageNames.compl: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._compl ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._compl { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21340,12 +21229,11 @@ extension SwiftProtoTesting_Names_MessageNames.const: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._const ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._const { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21377,12 +21265,11 @@ extension SwiftProtoTesting_Names_MessageNames.constexpr: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._constexpr ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._constexpr { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21414,12 +21301,11 @@ extension SwiftProtoTesting_Names_MessageNames.const_cast: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._constCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._constCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21451,12 +21337,11 @@ extension SwiftProtoTesting_Names_MessageNames.decltype: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._decltype ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._decltype { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21488,12 +21373,11 @@ extension SwiftProtoTesting_Names_MessageNames.delete: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._delete ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._delete { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21525,12 +21409,11 @@ extension SwiftProtoTesting_Names_MessageNames.dynamic_cast: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._dynamicCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._dynamicCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21562,12 +21445,11 @@ extension SwiftProtoTesting_Names_MessageNames.explicit: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._explicit ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._explicit { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21599,12 +21481,11 @@ extension SwiftProtoTesting_Names_MessageNames.export: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._export ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._export { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21636,12 +21517,11 @@ extension SwiftProtoTesting_Names_MessageNames.extern: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._extern ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._extern { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21673,12 +21553,11 @@ extension SwiftProtoTesting_Names_MessageNames.friend: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._friend ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._friend { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21710,12 +21589,11 @@ extension SwiftProtoTesting_Names_MessageNames.goto: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._goto ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._goto { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21747,12 +21625,11 @@ extension SwiftProtoTesting_Names_MessageNames.inline: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._inline ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._inline { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21784,12 +21661,11 @@ extension SwiftProtoTesting_Names_MessageNames.long: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._long ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._long { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21821,12 +21697,11 @@ extension SwiftProtoTesting_Names_MessageNames.mutable: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._mutable ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._mutable { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21858,12 +21733,11 @@ extension SwiftProtoTesting_Names_MessageNames.namespace: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._namespace ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._namespace { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21895,12 +21769,11 @@ extension SwiftProtoTesting_Names_MessageNames.new: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._new ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._new { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21932,12 +21805,11 @@ extension SwiftProtoTesting_Names_MessageNames.noexcept: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._noexcept ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._noexcept { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -21969,12 +21841,11 @@ extension SwiftProtoTesting_Names_MessageNames.not: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._not ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._not { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22006,12 +21877,11 @@ extension SwiftProtoTesting_Names_MessageNames.not_eq: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._notEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._notEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22043,12 +21913,11 @@ extension SwiftProtoTesting_Names_MessageNames.nullptr: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._nullptr ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._nullptr { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22080,12 +21949,11 @@ extension SwiftProtoTesting_Names_MessageNames.or: SwiftProtobuf.Message, SwiftP } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._or ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._or { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22117,12 +21985,11 @@ extension SwiftProtoTesting_Names_MessageNames.or_eq: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._orEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._orEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22154,12 +22021,11 @@ extension SwiftProtoTesting_Names_MessageNames.protected: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._protected ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._protected { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22191,12 +22057,11 @@ extension SwiftProtoTesting_Names_MessageNames.register: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._register ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._register { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22228,12 +22093,11 @@ extension SwiftProtoTesting_Names_MessageNames.reinterpret_cast: SwiftProtobuf.M } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._reinterpretCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._reinterpretCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22265,12 +22129,11 @@ extension SwiftProtoTesting_Names_MessageNames.short: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._short ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._short { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22302,12 +22165,11 @@ extension SwiftProtoTesting_Names_MessageNames.signed: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._signed ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._signed { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22339,12 +22201,11 @@ extension SwiftProtoTesting_Names_MessageNames.sizeof: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._sizeof ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._sizeof { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22376,12 +22237,11 @@ extension SwiftProtoTesting_Names_MessageNames.static_assert: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._staticAssert ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._staticAssert { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22413,12 +22273,11 @@ extension SwiftProtoTesting_Names_MessageNames.static_cast: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._staticCast ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._staticCast { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22450,12 +22309,11 @@ extension SwiftProtoTesting_Names_MessageNames.template: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._template ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._template { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22487,12 +22345,11 @@ extension SwiftProtoTesting_Names_MessageNames.this: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._this ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._this { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22524,12 +22381,11 @@ extension SwiftProtoTesting_Names_MessageNames.thread_local: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._threadLocal ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._threadLocal { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22561,12 +22417,11 @@ extension SwiftProtoTesting_Names_MessageNames.typedef: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._typedef ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._typedef { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22598,12 +22453,11 @@ extension SwiftProtoTesting_Names_MessageNames.typeid: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._typeid ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._typeid { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22635,12 +22489,11 @@ extension SwiftProtoTesting_Names_MessageNames.typename: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._typename ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._typename { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22672,12 +22525,11 @@ extension SwiftProtoTesting_Names_MessageNames.union: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._union ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._union { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22709,12 +22561,11 @@ extension SwiftProtoTesting_Names_MessageNames.unsigned: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._unsigned ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._unsigned { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22746,12 +22597,11 @@ extension SwiftProtoTesting_Names_MessageNames.using: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._using ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._using { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22783,12 +22633,11 @@ extension SwiftProtoTesting_Names_MessageNames.virtual: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._virtual ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._virtual { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22820,12 +22669,11 @@ extension SwiftProtoTesting_Names_MessageNames.void: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._void ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._void { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22857,12 +22705,11 @@ extension SwiftProtoTesting_Names_MessageNames.volatile: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._volatile ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._volatile { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22894,12 +22741,11 @@ extension SwiftProtoTesting_Names_MessageNames.wchar_t: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._wcharT ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._wcharT { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22931,12 +22777,11 @@ extension SwiftProtoTesting_Names_MessageNames.xor: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._xor ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._xor { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -22968,12 +22813,11 @@ extension SwiftProtoTesting_Names_MessageNames.xor_eq: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._xorEq ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._xorEq { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23005,12 +22849,11 @@ extension SwiftProtoTesting_Names_MessageNames.restrict: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._restrict ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._restrict { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23042,12 +22885,11 @@ extension SwiftProtoTesting_Names_MessageNames.Category: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._category ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._category { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23079,12 +22921,11 @@ extension SwiftProtoTesting_Names_MessageNames.Ivar: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._ivar ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._ivar { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23116,12 +22957,11 @@ extension SwiftProtoTesting_Names_MessageNames.Method: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._method ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._method { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23153,12 +22993,11 @@ extension SwiftProtoTesting_Names_MessageNames.finalize: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._finalize ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._finalize { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23190,12 +23029,11 @@ extension SwiftProtoTesting_Names_MessageNames.hash: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._hash ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._hash { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23227,12 +23065,11 @@ extension SwiftProtoTesting_Names_MessageNames.dealloc: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._dealloc ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._dealloc { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23264,12 +23101,11 @@ extension SwiftProtoTesting_Names_MessageNames.superclass: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._superclass ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._superclass { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23301,12 +23137,11 @@ extension SwiftProtoTesting_Names_MessageNames.retain: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._retain ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._retain { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23338,12 +23173,11 @@ extension SwiftProtoTesting_Names_MessageNames.release: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._release ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._release { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23375,12 +23209,11 @@ extension SwiftProtoTesting_Names_MessageNames.autorelease: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._autorelease ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._autorelease { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23412,12 +23245,11 @@ extension SwiftProtoTesting_Names_MessageNames.retainCount: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._retainCount ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._retainCount { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23449,12 +23281,11 @@ extension SwiftProtoTesting_Names_MessageNames.zone: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._zone ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._zone { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23486,12 +23317,11 @@ extension SwiftProtoTesting_Names_MessageNames.isProxy: SwiftProtobuf.Message, S } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._isProxy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._isProxy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23523,12 +23353,11 @@ extension SwiftProtoTesting_Names_MessageNames.copy: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._copy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._copy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23560,12 +23389,11 @@ extension SwiftProtoTesting_Names_MessageNames.mutableCopy: SwiftProtobuf.Messag } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._mutableCopy ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._mutableCopy { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23597,12 +23425,11 @@ extension SwiftProtoTesting_Names_MessageNames.classForCoder: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._classForCoder ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._classForCoder { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23634,12 +23461,11 @@ extension SwiftProtoTesting_Names_MessageNames.clear: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._clear ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._clear { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23671,12 +23497,11 @@ extension SwiftProtoTesting_Names_MessageNames.data: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._data ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._data { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23708,12 +23533,11 @@ extension SwiftProtoTesting_Names_MessageNames.delimitedData: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._delimitedData ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._delimitedData { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23745,12 +23569,11 @@ extension SwiftProtoTesting_Names_MessageNames.descriptor: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._descriptor ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._descriptor { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23782,12 +23605,11 @@ extension SwiftProtoTesting_Names_MessageNames.extensionRegistry: SwiftProtobuf. } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._extensionRegistry ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._extensionRegistry { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23819,12 +23641,11 @@ extension SwiftProtoTesting_Names_MessageNames.extensionsCurrentlySet: SwiftProt } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._extensionsCurrentlySet ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._extensionsCurrentlySet { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23856,12 +23677,11 @@ extension SwiftProtoTesting_Names_MessageNames.isInitializedMessage: SwiftProtob } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._isInitialized_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._isInitialized_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23893,12 +23713,11 @@ extension SwiftProtoTesting_Names_MessageNames.serializedSize: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._serializedSize ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._serializedSize { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23930,12 +23749,11 @@ extension SwiftProtoTesting_Names_MessageNames.sortedExtensionsInUse: SwiftProto } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._sortedExtensionsInUse ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._sortedExtensionsInUse { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -23967,12 +23785,11 @@ extension SwiftProtoTesting_Names_MessageNames.unknownFieldsMessage: SwiftProtob } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._unknownFields_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._unknownFields_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24004,12 +23821,11 @@ extension SwiftProtoTesting_Names_MessageNames.Fixed: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._fixed ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._fixed { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24041,12 +23857,11 @@ extension SwiftProtoTesting_Names_MessageNames.Fract: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._fract ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._fract { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24078,12 +23893,11 @@ extension SwiftProtoTesting_Names_MessageNames.Size: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._size ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._size { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24115,12 +23929,11 @@ extension SwiftProtoTesting_Names_MessageNames.LogicalAddress: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._logicalAddress ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._logicalAddress { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24152,12 +23965,11 @@ extension SwiftProtoTesting_Names_MessageNames.PhysicalAddress: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._physicalAddress ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._physicalAddress { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24189,12 +24001,11 @@ extension SwiftProtoTesting_Names_MessageNames.ByteCount: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._byteCount ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._byteCount { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24226,12 +24037,11 @@ extension SwiftProtoTesting_Names_MessageNames.ByteOffset: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._byteOffset ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._byteOffset { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24263,12 +24073,11 @@ extension SwiftProtoTesting_Names_MessageNames.Duration: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._duration ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._duration { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24300,12 +24109,11 @@ extension SwiftProtoTesting_Names_MessageNames.AbsoluteTime: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._absoluteTime ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._absoluteTime { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24337,12 +24145,11 @@ extension SwiftProtoTesting_Names_MessageNames.OptionBits: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._optionBits ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._optionBits { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24374,12 +24181,11 @@ extension SwiftProtoTesting_Names_MessageNames.ItemCount: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._itemCount ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._itemCount { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24411,12 +24217,11 @@ extension SwiftProtoTesting_Names_MessageNames.PBVersion: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._pbversion ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._pbversion { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24448,12 +24253,11 @@ extension SwiftProtoTesting_Names_MessageNames.ScriptCode: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._scriptCode ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._scriptCode { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24485,12 +24289,11 @@ extension SwiftProtoTesting_Names_MessageNames.LangCode: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._langCode ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._langCode { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24522,12 +24325,11 @@ extension SwiftProtoTesting_Names_MessageNames.RegionCode: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._regionCode ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._regionCode { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24559,12 +24361,11 @@ extension SwiftProtoTesting_Names_MessageNames.OSType: SwiftProtobuf.Message, Sw } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._ostype ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._ostype { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24596,12 +24397,11 @@ extension SwiftProtoTesting_Names_MessageNames.ProcessSerialNumber: SwiftProtobu } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._processSerialNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._processSerialNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24633,12 +24433,11 @@ extension SwiftProtoTesting_Names_MessageNames.Point: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._point ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._point { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24670,12 +24469,11 @@ extension SwiftProtoTesting_Names_MessageNames.Rect: SwiftProtobuf.Message, Swif } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._rect ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._rect { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24707,12 +24505,11 @@ extension SwiftProtoTesting_Names_MessageNames.FixedPoint: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._fixedPoint ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._fixedPoint { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24744,12 +24541,11 @@ extension SwiftProtoTesting_Names_MessageNames.FixedRect: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._fixedRect ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._fixedRect { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24781,12 +24577,11 @@ extension SwiftProtoTesting_Names_MessageNames.Style: SwiftProtobuf.Message, Swi } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._style ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._style { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24818,12 +24613,11 @@ extension SwiftProtoTesting_Names_MessageNames.StyleParameter: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._styleParameter ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._styleParameter { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24855,12 +24649,11 @@ extension SwiftProtoTesting_Names_MessageNames.StyleField: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._styleField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._styleField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24892,12 +24685,11 @@ extension SwiftProtoTesting_Names_MessageNames.TimeScale: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._timeScale ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._timeScale { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24929,12 +24721,11 @@ extension SwiftProtoTesting_Names_MessageNames.TimeBase: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._timeBase ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._timeBase { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -24966,12 +24757,11 @@ extension SwiftProtoTesting_Names_MessageNames.TimeRecord: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._timeRecord ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._timeRecord { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -25003,12 +24793,11 @@ extension SwiftProtoTesting_Names_MessageNames.serializedData: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._serializedData ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._serializedData { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -25040,12 +24829,11 @@ extension SwiftProtoTesting_Names_MessageNames.jsonUTF8Data: SwiftProtobuf.Messa } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._jsonUtf8Data ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._jsonUtf8Data { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -25077,12 +24865,11 @@ extension SwiftProtoTesting_Names_MessageNames.jsonString: SwiftProtobuf.Message } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._jsonString ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._jsonString { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -25114,12 +24901,11 @@ extension SwiftProtoTesting_Names_MessageNames.Extension: SwiftProtobuf.Message, } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._extension ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._extension { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -25151,12 +24937,11 @@ extension SwiftProtoTesting_Names_MessageNames.ExtensionsMessage: SwiftProtobuf. } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._extensions ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._extensions { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -26578,61 +26363,60 @@ extension SwiftProtoTesting_Names_FieldNamingInitials.Lowers: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._http ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._http { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._httpRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._httpRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._theHTTPRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._theHTTPRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._theHTTP ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._theHTTP { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._https ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._https { try visitor.visitSingularInt32Field(value: v, fieldNumber: 11) } }() - try { if let v = _storage._httpsRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._httpsRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 12) } }() - try { if let v = _storage._theHTTPSRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._theHTTPSRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 13) } }() - try { if let v = _storage._theHTTPS ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._theHTTPS { try visitor.visitSingularInt32Field(value: v, fieldNumber: 14) } }() - try { if let v = _storage._url ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._url { try visitor.visitSingularInt32Field(value: v, fieldNumber: 21) } }() - try { if let v = _storage._urlValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._urlValue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 22) } }() - try { if let v = _storage._theURLValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._theURLValue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 23) } }() - try { if let v = _storage._theURL ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._theURL { try visitor.visitSingularInt32Field(value: v, fieldNumber: 24) } }() - try { if let v = _storage._aBC ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._aBC { try visitor.visitSingularInt32Field(value: v, fieldNumber: 31) } }() - try { if let v = _storage._id ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._id { try visitor.visitSingularInt32Field(value: v, fieldNumber: 41) } }() - try { if let v = _storage._idNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._idNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 42) } }() - try { if let v = _storage._theIDNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._theIDNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 43) } }() - try { if let v = _storage._requestID ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._requestID { try visitor.visitSingularInt32Field(value: v, fieldNumber: 44) } }() } @@ -26719,57 +26503,56 @@ extension SwiftProtoTesting_Names_FieldNamingInitials.Uppers: SwiftProtobuf.Mess } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._http ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._http { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._httpRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._httpRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = self._theHTTPRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTPRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = self._theHTTP ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTP { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = self._https ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._https { try visitor.visitSingularInt32Field(value: v, fieldNumber: 11) } }() - try { if let v = self._httpsRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._httpsRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 12) } }() - try { if let v = self._theHTTPSRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTPSRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 13) } }() - try { if let v = self._theHTTPS ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTPS { try visitor.visitSingularInt32Field(value: v, fieldNumber: 14) } }() - try { if let v = self._url ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._url { try visitor.visitSingularInt32Field(value: v, fieldNumber: 21) } }() - try { if let v = self._urlValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._urlValue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 22) } }() - try { if let v = self._theURLValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theURLValue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 23) } }() - try { if let v = self._theURL ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theURL { try visitor.visitSingularInt32Field(value: v, fieldNumber: 24) } }() - try { if let v = self._id ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._id { try visitor.visitSingularInt32Field(value: v, fieldNumber: 41) } }() - try { if let v = self._idNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._idNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 42) } }() - try { if let v = self._theIDNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theIDNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 43) } }() - try { if let v = self._requestID ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requestID { try visitor.visitSingularInt32Field(value: v, fieldNumber: 44) } }() try unknownFields.traverse(visitor: &visitor) @@ -26846,57 +26629,56 @@ extension SwiftProtoTesting_Names_FieldNamingInitials.WordCase: SwiftProtobuf.Me } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._http ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._http { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._httpRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._httpRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = self._theHTTPRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTPRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = self._theHTTP ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTP { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = self._https ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._https { try visitor.visitSingularInt32Field(value: v, fieldNumber: 11) } }() - try { if let v = self._httpsRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._httpsRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 12) } }() - try { if let v = self._theHTTPSRequest ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTPSRequest { try visitor.visitSingularInt32Field(value: v, fieldNumber: 13) } }() - try { if let v = self._theHTTPS ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theHTTPS { try visitor.visitSingularInt32Field(value: v, fieldNumber: 14) } }() - try { if let v = self._url ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._url { try visitor.visitSingularInt32Field(value: v, fieldNumber: 21) } }() - try { if let v = self._urlValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._urlValue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 22) } }() - try { if let v = self._theURLValue ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theURLValue { try visitor.visitSingularInt32Field(value: v, fieldNumber: 23) } }() - try { if let v = self._theURL ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theURL { try visitor.visitSingularInt32Field(value: v, fieldNumber: 24) } }() - try { if let v = self._id ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._id { try visitor.visitSingularInt32Field(value: v, fieldNumber: 41) } }() - try { if let v = self._idNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._idNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 42) } }() - try { if let v = self._theIDNumber ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._theIDNumber { try visitor.visitSingularInt32Field(value: v, fieldNumber: 43) } }() - try { if let v = self._requestID ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requestID { try visitor.visitSingularInt32Field(value: v, fieldNumber: 44) } }() try unknownFields.traverse(visitor: &visitor) @@ -27140,18 +26922,17 @@ extension SwiftProtoTesting_Names_ValidIdentifiers: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self.__1Field ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self.__1Field { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._field ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._field { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = self.__3Field3 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self.__3Field3 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() switch self._2Of { @@ -27165,7 +26946,7 @@ extension SwiftProtoTesting_Names_ValidIdentifiers: SwiftProtobuf.Message, Swift }() case nil: break } - try { if let v = self._enumField ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Names_ValidIdentifiers.TestEnum.testEnum0 : nil) { + try { if let v = self._enumField { try visitor.visitSingularEnumField(value: v, fieldNumber: 6) } }() try unknownFields.traverse(visitor: &visitor) @@ -27253,12 +27034,11 @@ extension SwiftProtoTesting_Names_SpecialNames2: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._newValue ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._newValue { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -27399,13 +27179,12 @@ extension SwiftProtoTesting_Names_SpecialNames4: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields try withExtendedLifetime(_storage) { (_storage: _StorageClass) in // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._newValue ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._newValue { try visitor.visitSingularStringField(value: v, fieldNumber: 1) } }() try { if let v = _storage._forcesStorage { diff --git a/Tests/SwiftProtobufTests/unittest_swift_naming_number_prefix.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_naming_number_prefix.pb.swift index ed10999d7..30cffa5d0 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_naming_number_prefix.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_naming_number_prefix.pb.swift @@ -80,12 +80,11 @@ extension _4fun_SwiftProtoTesting_Mumble_MyMessage: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_oneof_all_required.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_oneof_all_required.pb.swift index fc3a5646b..e0359e8c1 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_oneof_all_required.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_oneof_all_required.pb.swift @@ -224,12 +224,11 @@ extension SwiftProtoTesting_OneOfOptionMessage1: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._requiredField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requiredField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -266,12 +265,11 @@ extension SwiftProtoTesting_OneOfOptionMessage2: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._requiredField ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requiredField { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() try unknownFields.traverse(visitor: &visitor) @@ -416,15 +414,14 @@ extension SwiftProtoTesting_OneOfContainer.Option3: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 4) } }() - try { if let v = self._b ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._b { try visitor.visitSingularStringField(value: v, fieldNumber: 5) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_oneof_merging.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_oneof_merging.pb.swift index eb5cf71e8..cf9264363 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_oneof_merging.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_oneof_merging.pb.swift @@ -286,18 +286,17 @@ extension SwiftProtoTesting_Merging_TestMessage.NestedMessage: SwiftProtobuf.Mes } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._b ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._b { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = self._c ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._c { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_reserved.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_reserved.pb.swift index 754461695..c8a3e1143 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_reserved.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_reserved.pb.swift @@ -575,33 +575,32 @@ extension SwiftProtoTesting_SwiftReservedTest: SwiftProtobuf.Message, SwiftProto } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._protoMessageName ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._protoMessageName { try visitor.visitSingularInt32Field(value: v, fieldNumber: 10) } }() - try { if let v = self._protoPackageName ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._protoPackageName { try visitor.visitSingularInt32Field(value: v, fieldNumber: 11) } }() - try { if let v = self._anyTypePrefix ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._anyTypePrefix { try visitor.visitSingularInt32Field(value: v, fieldNumber: 12) } }() - try { if let v = self._anyTypeURL ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._anyTypeURL { try visitor.visitSingularInt32Field(value: v, fieldNumber: 13) } }() - try { if let v = self._isInitialized_p ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._isInitialized_p { try visitor.visitSingularStringField(value: v, fieldNumber: 20) } }() - try { if let v = self._hashValue_p ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = self._hashValue_p { try visitor.visitSingularStringField(value: v, fieldNumber: 21) } }() - try { if let v = self._debugDescription_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._debugDescription_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 22) } }() - try { if let v = self._requiredInt ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._requiredInt { try visitor.visitSingularInt32Field(value: v, fieldNumber: 30) } }() try unknownFields.traverse(visitor: &visitor) diff --git a/Tests/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift b/Tests/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift index dacd631ea..36bdd94d4 100644 --- a/Tests/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift +++ b/Tests/SwiftProtobufTests/unittest_swift_runtime_proto2.pb.swift @@ -1243,49 +1243,49 @@ extension SwiftProtoTesting_Message2: SwiftProtobuf.Message, SwiftProtobuf._Mess // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = _storage._optionalInt32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalInt32 { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = _storage._optionalInt64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalInt64 { try visitor.visitSingularInt64Field(value: v, fieldNumber: 2) } }() - try { if let v = _storage._optionalUint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalUint32 { try visitor.visitSingularUInt32Field(value: v, fieldNumber: 3) } }() - try { if let v = _storage._optionalUint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalUint64 { try visitor.visitSingularUInt64Field(value: v, fieldNumber: 4) } }() - try { if let v = _storage._optionalSint32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSint32 { try visitor.visitSingularSInt32Field(value: v, fieldNumber: 5) } }() - try { if let v = _storage._optionalSint64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSint64 { try visitor.visitSingularSInt64Field(value: v, fieldNumber: 6) } }() - try { if let v = _storage._optionalFixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFixed32 { try visitor.visitSingularFixed32Field(value: v, fieldNumber: 7) } }() - try { if let v = _storage._optionalFixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFixed64 { try visitor.visitSingularFixed64Field(value: v, fieldNumber: 8) } }() - try { if let v = _storage._optionalSfixed32 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSfixed32 { try visitor.visitSingularSFixed32Field(value: v, fieldNumber: 9) } }() - try { if let v = _storage._optionalSfixed64 ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalSfixed64 { try visitor.visitSingularSFixed64Field(value: v, fieldNumber: 10) } }() - try { if let v = _storage._optionalFloat ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalFloat { try visitor.visitSingularFloatField(value: v, fieldNumber: 11) } }() - try { if let v = _storage._optionalDouble ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = _storage._optionalDouble { try visitor.visitSingularDoubleField(value: v, fieldNumber: 12) } }() - try { if let v = _storage._optionalBool ?? (alwaysVisitPrimitiveFields ? false : nil) { + try { if let v = _storage._optionalBool { try visitor.visitSingularBoolField(value: v, fieldNumber: 13) } }() - try { if let v = _storage._optionalString ?? (alwaysVisitPrimitiveFields ? String() : nil) { + try { if let v = _storage._optionalString { try visitor.visitSingularStringField(value: v, fieldNumber: 14) } }() - try { if let v = _storage._optionalBytes ?? (alwaysVisitPrimitiveFields ? Data() : nil) { + try { if let v = _storage._optionalBytes { try visitor.visitSingularBytesField(value: v, fieldNumber: 15) } }() try { if let v = _storage._optionalGroup { @@ -1294,7 +1294,7 @@ extension SwiftProtoTesting_Message2: SwiftProtobuf.Message, SwiftProtobuf._Mess try { if let v = _storage._optionalMessage { try visitor.visitSingularMessageField(value: v, fieldNumber: 18) } }() - try { if let v = _storage._optionalEnum ?? (alwaysVisitPrimitiveFields ? SwiftProtoTesting_Message2.Enum.foo : nil) { + try { if let v = _storage._optionalEnum { try visitor.visitSingularEnumField(value: v, fieldNumber: 19) } }() if !_storage._repeatedInt32.isEmpty || alwaysVisitPrimitiveFields { @@ -1585,12 +1585,11 @@ extension SwiftProtoTesting_Message2.OptionalGroup: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 17) } }() try unknownFields.traverse(visitor: &visitor) @@ -1622,12 +1621,11 @@ extension SwiftProtoTesting_Message2.RepeatedGroup: SwiftProtobuf.Message, Swift } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 47) } }() try unknownFields.traverse(visitor: &visitor) @@ -1661,15 +1659,14 @@ extension SwiftProtoTesting_Message2.OneofGroup: SwiftProtobuf.Message, SwiftPro } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._a ?? (alwaysVisitPrimitiveFields ? 116 : nil) { + try { if let v = self._a { try visitor.visitSingularInt32Field(value: v, fieldNumber: 67) } }() - try { if let v = self._b ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._b { try visitor.visitSingularInt32Field(value: v, fieldNumber: 167) } }() try unknownFields.traverse(visitor: &visitor) @@ -1793,18 +1790,17 @@ extension SwiftProtoTesting_Msg2NamesNoStorage: SwiftProtobuf.Message, SwiftProt } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._isInitialized_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._isInitialized_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._debugDescription_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._debugDescription_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() - try { if let v = self._value ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._value { try visitor.visitSingularInt32Field(value: v, fieldNumber: 3) } }() try unknownFields.traverse(visitor: &visitor) @@ -1842,15 +1838,14 @@ extension SwiftProtoTesting_Msg2NamesUsesStorage: SwiftProtobuf.Message, SwiftPr } func traverse(visitor: inout V) throws { - let alwaysVisitPrimitiveFields = visitor.traversalOptions.alwaysVisitPrimitiveFields // The use of inline closures is to circumvent an issue where the compiler // allocates stack space for every if/case branch local when no optimizations // are enabled. https://github.com/apple/swift-protobuf/issues/1034 and // https://github.com/apple/swift-protobuf/issues/1182 - try { if let v = self._isInitialized_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._isInitialized_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 1) } }() - try { if let v = self._debugDescription_p ?? (alwaysVisitPrimitiveFields ? 0 : nil) { + try { if let v = self._debugDescription_p { try visitor.visitSingularInt32Field(value: v, fieldNumber: 2) } }() try { if let v = self._value {