Commit b6311767 authored by Dave MacLachlan's avatar Dave MacLachlan Committed by Thomas Van Lenten

Minimize amount of filepaths being copied into protos.

By putting the NSAssert behind a DEBUG flag we aren't copying filepaths
into release builds.
parent a50008ff
...@@ -98,7 +98,9 @@ typedef struct GPBAny__storage_ { ...@@ -98,7 +98,9 @@ typedef struct GPBAny__storage_ {
"\001\001\004\241!!\000"; "\001\001\004\241!!\000";
[localDescriptor setupExtraTextInfo:extraTextFormatInfo]; [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -152,7 +152,9 @@ typedef struct GPBApi__storage_ { ...@@ -152,7 +152,9 @@ typedef struct GPBApi__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBApi__storage_) storageSize:sizeof(GPBApi__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -276,7 +278,9 @@ typedef struct GPBMethod__storage_ { ...@@ -276,7 +278,9 @@ typedef struct GPBMethod__storage_ {
"\002\002\007\244\241!!\000\004\010\244\241!!\000"; "\002\002\007\244\241!!\000\004\010\244\241!!\000";
[localDescriptor setupExtraTextInfo:extraTextFormatInfo]; [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -342,7 +346,9 @@ typedef struct GPBMixin__storage_ { ...@@ -342,7 +346,9 @@ typedef struct GPBMixin__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBMixin__storage_) storageSize:sizeof(GPBMixin__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -93,7 +93,9 @@ typedef struct GPBDuration__storage_ { ...@@ -93,7 +93,9 @@ typedef struct GPBDuration__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBDuration__storage_) storageSize:sizeof(GPBDuration__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -69,7 +69,9 @@ typedef struct GPBEmpty__storage_ { ...@@ -69,7 +69,9 @@ typedef struct GPBEmpty__storage_ {
fieldCount:0 fieldCount:0
storageSize:sizeof(GPBEmpty__storage_) storageSize:sizeof(GPBEmpty__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -82,7 +82,9 @@ typedef struct GPBFieldMask__storage_ { ...@@ -82,7 +82,9 @@ typedef struct GPBFieldMask__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBFieldMask__storage_) storageSize:sizeof(GPBFieldMask__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -82,7 +82,9 @@ typedef struct GPBSourceContext__storage_ { ...@@ -82,7 +82,9 @@ typedef struct GPBSourceContext__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBSourceContext__storage_) storageSize:sizeof(GPBSourceContext__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -118,7 +118,9 @@ typedef struct GPBStruct__storage_ { ...@@ -118,7 +118,9 @@ typedef struct GPBStruct__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBStruct__storage_) storageSize:sizeof(GPBStruct__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -222,7 +224,9 @@ typedef struct GPBValue__storage_ { ...@@ -222,7 +224,9 @@ typedef struct GPBValue__storage_ {
[localDescriptor setupOneofs:oneofs [localDescriptor setupOneofs:oneofs
count:(uint32_t)(sizeof(oneofs) / sizeof(char*)) count:(uint32_t)(sizeof(oneofs) / sizeof(char*))
firstHasIndex:-1]; firstHasIndex:-1];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -282,7 +286,9 @@ typedef struct GPBListValue__storage_ { ...@@ -282,7 +286,9 @@ typedef struct GPBListValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBListValue__storage_) storageSize:sizeof(GPBListValue__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -93,7 +93,9 @@ typedef struct GPBTimestamp__storage_ { ...@@ -93,7 +93,9 @@ typedef struct GPBTimestamp__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBTimestamp__storage_) storageSize:sizeof(GPBTimestamp__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -178,7 +178,9 @@ typedef struct GPBType__storage_ { ...@@ -178,7 +178,9 @@ typedef struct GPBType__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBType__storage_) storageSize:sizeof(GPBType__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -336,7 +338,9 @@ typedef struct GPBField__storage_ { ...@@ -336,7 +338,9 @@ typedef struct GPBField__storage_ {
"\001\006\004\241!!\000"; "\001\006\004\241!!\000";
[localDescriptor setupExtraTextInfo:extraTextFormatInfo]; [localDescriptor setupExtraTextInfo:extraTextFormatInfo];
#endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS #endif // !GPBOBJC_SKIP_MESSAGE_TEXTFORMAT_EXTRAS
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -561,7 +565,9 @@ typedef struct GPBEnum__storage_ { ...@@ -561,7 +565,9 @@ typedef struct GPBEnum__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBEnum__storage_) storageSize:sizeof(GPBEnum__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -638,7 +644,9 @@ typedef struct GPBEnumValue__storage_ { ...@@ -638,7 +644,9 @@ typedef struct GPBEnumValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBEnumValue__storage_) storageSize:sizeof(GPBEnumValue__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -692,7 +700,9 @@ typedef struct GPBOption__storage_ { ...@@ -692,7 +700,9 @@ typedef struct GPBOption__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBOption__storage_) storageSize:sizeof(GPBOption__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -82,7 +82,9 @@ typedef struct GPBDoubleValue__storage_ { ...@@ -82,7 +82,9 @@ typedef struct GPBDoubleValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBDoubleValue__storage_) storageSize:sizeof(GPBDoubleValue__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -125,7 +127,9 @@ typedef struct GPBFloatValue__storage_ { ...@@ -125,7 +127,9 @@ typedef struct GPBFloatValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBFloatValue__storage_) storageSize:sizeof(GPBFloatValue__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -168,7 +172,9 @@ typedef struct GPBInt64Value__storage_ { ...@@ -168,7 +172,9 @@ typedef struct GPBInt64Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBInt64Value__storage_) storageSize:sizeof(GPBInt64Value__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -211,7 +217,9 @@ typedef struct GPBUInt64Value__storage_ { ...@@ -211,7 +217,9 @@ typedef struct GPBUInt64Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBUInt64Value__storage_) storageSize:sizeof(GPBUInt64Value__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -254,7 +262,9 @@ typedef struct GPBInt32Value__storage_ { ...@@ -254,7 +262,9 @@ typedef struct GPBInt32Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBInt32Value__storage_) storageSize:sizeof(GPBInt32Value__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -297,7 +307,9 @@ typedef struct GPBUInt32Value__storage_ { ...@@ -297,7 +307,9 @@ typedef struct GPBUInt32Value__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBUInt32Value__storage_) storageSize:sizeof(GPBUInt32Value__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -339,7 +351,9 @@ typedef struct GPBBoolValue__storage_ { ...@@ -339,7 +351,9 @@ typedef struct GPBBoolValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBBoolValue__storage_) storageSize:sizeof(GPBBoolValue__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -382,7 +396,9 @@ typedef struct GPBStringValue__storage_ { ...@@ -382,7 +396,9 @@ typedef struct GPBStringValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBStringValue__storage_) storageSize:sizeof(GPBStringValue__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
...@@ -425,7 +441,9 @@ typedef struct GPBBytesValue__storage_ { ...@@ -425,7 +441,9 @@ typedef struct GPBBytesValue__storage_ {
fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription)) fieldCount:(uint32_t)(sizeof(fields) / sizeof(GPBMessageFieldDescription))
storageSize:sizeof(GPBBytesValue__storage_) storageSize:sizeof(GPBBytesValue__storage_)
flags:GPBDescriptorInitializationFlag_None]; flags:GPBDescriptorInitializationFlag_None];
NSAssert(descriptor == nil, @"Startup recursed!"); #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
......
...@@ -604,7 +604,9 @@ void MessageGenerator::GenerateSource(io::Printer* printer) { ...@@ -604,7 +604,9 @@ void MessageGenerator::GenerateSource(io::Printer* printer) {
"suffix", suffix_added); "suffix", suffix_added);
} }
printer->Print( printer->Print(
" NSAssert(descriptor == nil, @\"Startup recursed!\");\n" " #if defined(DEBUG) && DEBUG\n"
" NSAssert(descriptor == nil, @\"Startup recursed!\");\n"
" #endif // DEBUG\n"
" descriptor = localDescriptor;\n" " descriptor = localDescriptor;\n"
" }\n" " }\n"
" return descriptor;\n" " return descriptor;\n"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment