From 743bf9214601eddaf13456b1029247e0a6d9a92f Mon Sep 17 00:00:00 2001 From: Protobuf Team Bot Date: Thu, 14 Sep 2023 01:12:11 +0000 Subject: [PATCH] Auto-generate files after cl/565212511 --- php/ext/google/protobuf/php-upb.c | 3 ++ php/ext/google/protobuf/php-upb.h | 47 +++++++++++++++------------ ruby/ext/google/protobuf_c/ruby-upb.c | 3 ++ ruby/ext/google/protobuf_c/ruby-upb.h | 47 +++++++++++++++------------ 4 files changed, 58 insertions(+), 42 deletions(-) diff --git a/php/ext/google/protobuf/php-upb.c b/php/ext/google/protobuf/php-upb.c index fb6a75697f..416fe71303 100644 --- a/php/ext/google/protobuf/php-upb.c +++ b/php/ext/google/protobuf/php-upb.c @@ -14086,6 +14086,9 @@ TAGBYTES(r) // We encode backwards, to avoid pre-computing lengths (one-pass encode). +#include +#include +#include #include diff --git a/php/ext/google/protobuf/php-upb.h b/php/ext/google/protobuf/php-upb.h index 51357fb61e..b8b05623dd 100644 --- a/php/ext/google/protobuf/php-upb.h +++ b/php/ext/google/protobuf/php-upb.h @@ -3420,23 +3420,9 @@ typedef struct upb_MiniTableFile upb_MiniTableFile; #ifndef UPB_WIRE_DECODE_H_ #define UPB_WIRE_DECODE_H_ +#include +#include -#ifndef UPB_WIRE_TYPES_H_ -#define UPB_WIRE_TYPES_H_ - -#define kUpb_WireFormat_DefaultDepthLimit 100 - -// A list of types as they are encoded on the wire. -typedef enum { - kUpb_WireType_Varint = 0, - kUpb_WireType_64Bit = 1, - kUpb_WireType_Delimited = 2, - kUpb_WireType_StartGroup = 3, - kUpb_WireType_EndGroup = 4, - kUpb_WireType_32Bit = 5 -} upb_WireType; - -#endif /* UPB_WIRE_TYPES_H_ */ // Must be last. @@ -3692,6 +3678,9 @@ TAGBYTES(r) #ifndef UPB_WIRE_ENCODE_H_ #define UPB_WIRE_ENCODE_H_ +#include +#include + // Must be last. @@ -11938,8 +11927,10 @@ UPB_INLINE bool upb_Arena_HasInitialBlock(upb_Arena* arena) { #ifdef UPB_USE_C11_ATOMICS +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports #define upb_Atomic_Init(addr, val) atomic_init(addr, val) #define upb_Atomic_Load(addr, order) atomic_load_explicit(addr, order) @@ -12046,6 +12037,21 @@ UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) { #endif /* UPB_WIRE_INTERNAL_SWAP_H_ */ +#ifndef UPB_WIRE_TYPES_H_ +#define UPB_WIRE_TYPES_H_ + +// A list of types as they are encoded on the wire. +typedef enum { + kUpb_WireType_Varint = 0, + kUpb_WireType_64Bit = 1, + kUpb_WireType_Delimited = 2, + kUpb_WireType_StartGroup = 3, + kUpb_WireType_EndGroup = 4, + kUpb_WireType_32Bit = 5 +} upb_WireType; + +#endif /* UPB_WIRE_TYPES_H_ */ + // Must be last. #ifdef __cplusplus @@ -13046,10 +13052,10 @@ upb_MethodDef* _upb_MethodDefs_New( #endif /* UPB_REFLECTION_METHOD_DEF_INTERNAL_H_ */ -#ifndef UPB_WIRE_INTERNAL_COMMON_H_ -#define UPB_WIRE_INTERNAL_COMMON_H_ +#ifndef UPB_WIRE_INTERNAL_CONSTANTS_H_ +#define UPB_WIRE_INTERNAL_CONSTANTS_H_ -// Must be last. +#define kUpb_WireFormat_DefaultDepthLimit 100 // MessageSet wire format is: // message MessageSet { @@ -13065,8 +13071,7 @@ enum { kUpb_MsgSet_Message = 3, }; - -#endif /* UPB_WIRE_INTERNAL_COMMON_H_ */ +#endif /* UPB_WIRE_INTERNAL_CONSTANTS_H_ */ /* * Internal implementation details of the decoder that are shared between diff --git a/ruby/ext/google/protobuf_c/ruby-upb.c b/ruby/ext/google/protobuf_c/ruby-upb.c index 99c0970215..4f7b639944 100644 --- a/ruby/ext/google/protobuf_c/ruby-upb.c +++ b/ruby/ext/google/protobuf_c/ruby-upb.c @@ -13604,6 +13604,9 @@ TAGBYTES(r) // We encode backwards, to avoid pre-computing lengths (one-pass encode). +#include +#include +#include #include diff --git a/ruby/ext/google/protobuf_c/ruby-upb.h b/ruby/ext/google/protobuf_c/ruby-upb.h index d7adbf113f..8c5270af56 100755 --- a/ruby/ext/google/protobuf_c/ruby-upb.h +++ b/ruby/ext/google/protobuf_c/ruby-upb.h @@ -3383,23 +3383,9 @@ typedef struct upb_MiniTableFile upb_MiniTableFile; #ifndef UPB_WIRE_DECODE_H_ #define UPB_WIRE_DECODE_H_ +#include +#include -#ifndef UPB_WIRE_TYPES_H_ -#define UPB_WIRE_TYPES_H_ - -#define kUpb_WireFormat_DefaultDepthLimit 100 - -// A list of types as they are encoded on the wire. -typedef enum { - kUpb_WireType_Varint = 0, - kUpb_WireType_64Bit = 1, - kUpb_WireType_Delimited = 2, - kUpb_WireType_StartGroup = 3, - kUpb_WireType_EndGroup = 4, - kUpb_WireType_32Bit = 5 -} upb_WireType; - -#endif /* UPB_WIRE_TYPES_H_ */ // Must be last. @@ -3655,6 +3641,9 @@ TAGBYTES(r) #ifndef UPB_WIRE_ENCODE_H_ #define UPB_WIRE_ENCODE_H_ +#include +#include + // Must be last. @@ -11708,8 +11697,10 @@ UPB_INLINE bool upb_Arena_HasInitialBlock(upb_Arena* arena) { #ifdef UPB_USE_C11_ATOMICS +// IWYU pragma: begin_exports #include #include +// IWYU pragma: end_exports #define upb_Atomic_Init(addr, val) atomic_init(addr, val) #define upb_Atomic_Load(addr, order) atomic_load_explicit(addr, order) @@ -11816,6 +11807,21 @@ UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) { #endif /* UPB_WIRE_INTERNAL_SWAP_H_ */ +#ifndef UPB_WIRE_TYPES_H_ +#define UPB_WIRE_TYPES_H_ + +// A list of types as they are encoded on the wire. +typedef enum { + kUpb_WireType_Varint = 0, + kUpb_WireType_64Bit = 1, + kUpb_WireType_Delimited = 2, + kUpb_WireType_StartGroup = 3, + kUpb_WireType_EndGroup = 4, + kUpb_WireType_32Bit = 5 +} upb_WireType; + +#endif /* UPB_WIRE_TYPES_H_ */ + // Must be last. #ifdef __cplusplus @@ -12863,10 +12869,10 @@ upb_MethodDef* _upb_MethodDefs_New( #endif /* UPB_REFLECTION_METHOD_DEF_INTERNAL_H_ */ -#ifndef UPB_WIRE_INTERNAL_COMMON_H_ -#define UPB_WIRE_INTERNAL_COMMON_H_ +#ifndef UPB_WIRE_INTERNAL_CONSTANTS_H_ +#define UPB_WIRE_INTERNAL_CONSTANTS_H_ -// Must be last. +#define kUpb_WireFormat_DefaultDepthLimit 100 // MessageSet wire format is: // message MessageSet { @@ -12882,8 +12888,7 @@ enum { kUpb_MsgSet_Message = 3, }; - -#endif /* UPB_WIRE_INTERNAL_COMMON_H_ */ +#endif /* UPB_WIRE_INTERNAL_CONSTANTS_H_ */ /* * Internal implementation details of the decoder that are shared between