Chiebot-Mirror
/
protobuf
mirror of https://github.com/protocolbuffers/protobuf.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Respect NDEBUG for asserts even though Ruby 3+ pollutes it.

Browse Source 
Prior to this CL, asserts have no effect for Ruby 3+, because Ruby unconditionally defines `NDEBUG`: https://bugs.ruby-lang.org/issues/18777

We work around this by doing `#undef NDEBUG` right after including Ruby, if `NDEBUG` was not previously defined.

PiperOrigin-RevId: 535359088
pull/12915/head
Joshua Haberman 2 years ago committed by Copybara-Service
parent 5101674194
commit b2a520f693
17 changed files with 66 additions and 64 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      objectivec/GPBAny.pbobjc.m
  2. 12
      objectivec/GPBApi.pbobjc.m
  3. 4
      objectivec/GPBDuration.pbobjc.m
  4. 4
      objectivec/GPBEmpty.pbobjc.m
  5. 4
      objectivec/GPBFieldMask.pbobjc.m
  6. 4
      objectivec/GPBSourceContext.pbobjc.m
  7. 12
      objectivec/GPBStruct.pbobjc.m
  8. 4
      objectivec/GPBTimestamp.pbobjc.m
  9. 20
      objectivec/GPBType.pbobjc.m
  10. 36
      objectivec/GPBWrappers.pbobjc.m
  11. 2
      ruby/ext/google/protobuf_c/convert.h
  12. 2
      ruby/ext/google/protobuf_c/defs.h
  13. 2
      ruby/ext/google/protobuf_c/map.h
  14. 2
      ruby/ext/google/protobuf_c/message.h
  15. 14
      ruby/ext/google/protobuf_c/protobuf.h
  16. 2
      ruby/ext/google/protobuf_c/repeated_field.c
  17. 2
      ruby/ext/google/protobuf_c/repeated_field.h

4
objectivec/GPBAny.pbobjc.m
Unescape View File

@ -91,9 +91,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
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

12
objectivec/GPBApi.pbobjc.m
Unescape View File

@ -145,9 +145,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -272,9 +272,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
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -341,9 +341,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBDuration.pbobjc.m
Unescape View File

@ -86,9 +86,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBEmpty.pbobjc.m
Unescape View File

@ -62,9 +62,9 @@ typedef struct GPBEmpty__storage_ {
fieldCount:0 fieldCount:0
storageSize:sizeof(GPBEmpty__storage_) storageSize:sizeof(GPBEmpty__storage_)
flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBFieldMask.pbobjc.m
Unescape View File

@ -75,9 +75,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBSourceContext.pbobjc.m
Unescape View File

@ -75,9 +75,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

12
objectivec/GPBStruct.pbobjc.m
Unescape View File

@ -115,9 +115,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -222,9 +222,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];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -285,9 +285,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

4
objectivec/GPBTimestamp.pbobjc.m
Unescape View File

@ -86,9 +86,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

20
objectivec/GPBType.pbobjc.m
Unescape View File

@ -307,9 +307,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -468,9 +468,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
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -593,9 +593,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -673,9 +673,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -730,9 +730,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

36
objectivec/GPBWrappers.pbobjc.m
Unescape View File

@ -83,9 +83,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -129,9 +129,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -175,9 +175,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -221,9 +221,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -267,9 +267,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -313,9 +313,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -358,9 +358,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -404,9 +404,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;
@ -450,9 +450,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:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)]; flags:(GPBDescriptorInitializationFlags)(GPBDescriptorInitializationFlag_UsesClassRefs | GPBDescriptorInitializationFlag_Proto3OptionalKnown | GPBDescriptorInitializationFlag_ClosedEnumSupportKnown)];
#if defined(DEBUG) && DEBUG #if defined(DEBUG) && DEBUG
NSAssert(descriptor == nil, @"Startup recursed!"); NSAssert(descriptor == nil, @"Startup recursed!");
#endif // DEBUG #endif // DEBUG
descriptor = localDescriptor; descriptor = localDescriptor;
} }
return descriptor; return descriptor;

2
ruby/ext/google/protobuf_c/convert.h
Unescape View File

@ -31,8 +31,6 @@
#ifndef RUBY_PROTOBUF_CONVERT_H_ #ifndef RUBY_PROTOBUF_CONVERT_H_
#define RUBY_PROTOBUF_CONVERT_H_ #define RUBY_PROTOBUF_CONVERT_H_
#include <ruby/ruby.h>
#include "protobuf.h" #include "protobuf.h"
#include "ruby-upb.h" #include "ruby-upb.h"

2
ruby/ext/google/protobuf_c/defs.h
Unescape View File

@ -31,8 +31,6 @@
#ifndef RUBY_PROTOBUF_DEFS_H_ #ifndef RUBY_PROTOBUF_DEFS_H_
#define RUBY_PROTOBUF_DEFS_H_ #define RUBY_PROTOBUF_DEFS_H_
#include <ruby/ruby.h>
#include "protobuf.h" #include "protobuf.h"
#include "ruby-upb.h" #include "ruby-upb.h"

2
ruby/ext/google/protobuf_c/map.h
Unescape View File

@ -31,8 +31,6 @@
#ifndef RUBY_PROTOBUF_MAP_H_ #ifndef RUBY_PROTOBUF_MAP_H_
#define RUBY_PROTOBUF_MAP_H_ #define RUBY_PROTOBUF_MAP_H_
#include <ruby/ruby.h>
#include "protobuf.h" #include "protobuf.h"
#include "ruby-upb.h" #include "ruby-upb.h"

2
ruby/ext/google/protobuf_c/message.h
Unescape View File

@ -31,8 +31,6 @@
#ifndef RUBY_PROTOBUF_MESSAGE_H_ #ifndef RUBY_PROTOBUF_MESSAGE_H_
#define RUBY_PROTOBUF_MESSAGE_H_ #define RUBY_PROTOBUF_MESSAGE_H_
#include <ruby/ruby.h>
#include "protobuf.h" #include "protobuf.h"
#include "ruby-upb.h" #include "ruby-upb.h"

14
ruby/ext/google/protobuf_c/protobuf.h
Unescape View File

@ -31,8 +31,16 @@
#ifndef __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__ #ifndef __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__
#define __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__ #define __GOOGLE_PROTOBUF_RUBY_PROTOBUF_H__
// Ruby 3+ defines NDEBUG itself, see: https://bugs.ruby-lang.org/issues/18777
#ifdef NDEBUG
#include <ruby.h>
#else
#include <ruby.h>
#undef NDEBUG
#endif
#include <assert.h> // Must be included after the NDEBUG logic above.
#include <ruby/encoding.h> #include <ruby/encoding.h>
#include <ruby/ruby.h>
#include <ruby/vm.h> #include <ruby/vm.h>
#include "defs.h" #include "defs.h"
@ -110,7 +118,9 @@ extern VALUE cTypeError;
do { \ do { \
} while (false && (expr)) } while (false && (expr))
#else #else
#define PBRUBY_ASSERT(expr) assert(expr) #define PBRUBY_ASSERT(expr) \
if (!(expr)) \
rb_bug("Assertion failed at %s:%d, expr: %s", __FILE__, __LINE__, #expr)
#endif #endif
#define PBRUBY_MAX(x, y) (((x) > (y)) ? (x) : (y)) #define PBRUBY_MAX(x, y) (((x) > (y)) ? (x) : (y))

2
ruby/ext/google/protobuf_c/repeated_field.c
Unescape View File

@ -100,6 +100,8 @@ VALUE RepeatedField_GetRubyWrapper(upb_Array* array, TypeInfo type_info,
PBRUBY_ASSERT(ruby_to_RepeatedField(val)->type_info.type == type_info.type); PBRUBY_ASSERT(ruby_to_RepeatedField(val)->type_info.type == type_info.type);
PBRUBY_ASSERT(ruby_to_RepeatedField(val)->type_info.def.msgdef == PBRUBY_ASSERT(ruby_to_RepeatedField(val)->type_info.def.msgdef ==
type_info.def.msgdef); type_info.def.msgdef);
PBRUBY_ASSERT(ruby_to_RepeatedField(val)->array == array);
return val; return val;
} }

2
ruby/ext/google/protobuf_c/repeated_field.h
Unescape View File

@ -31,8 +31,6 @@
#ifndef RUBY_PROTOBUF_REPEATED_FIELD_H_ #ifndef RUBY_PROTOBUF_REPEATED_FIELD_H_
#define RUBY_PROTOBUF_REPEATED_FIELD_H_ #define RUBY_PROTOBUF_REPEATED_FIELD_H_
#include <ruby/ruby.h>
#include "protobuf.h" #include "protobuf.h"
#include "ruby-upb.h" #include "ruby-upb.h"

Write Preview
Loading…
Cancel
Save