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

upb: tighten up and lock down upb/wire/

Browse Source 
PiperOrigin-RevId: 593821827
pull/15179/head
Eric Salo 11 months ago committed by Copybara-Service
parent 16afb4dea7
commit 2fb0b93d9d
21 changed files with 142 additions and 150 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      protos/BUILD
  2. 1
      python/BUILD.bazel
  3. 19
      upb/BUILD
  4. 2
      upb/generated_code_support.h
  5. 2
      upb/message/BUILD
  6. 1
      upb/mini_table/BUILD
  7. 4
      upb/mini_table/internal/message.h
  8. 1
      upb/text/BUILD
  9. 5
      upb/util/BUILD
  10. 9
      upb/util/compare_test.cc
  11. 46
      upb/wire/BUILD
  12. 9
      upb/wire/decode.c
  13. 15
      upb/wire/encode.c
  14. 1
      upb/wire/encode.h
  15. 2
      upb/wire/internal/decode_fast.c
  16. 6
      upb/wire/internal/decode_fast.h
  17. 22
      upb/wire/internal/endian.h
  18. 61
      upb/wire/internal/reader.h
  19. 15
      upb/wire/reader.c
  20. 65
      upb/wire/reader.h
  21. 4
      upb_generator/BUILD

2
protos/BUILD
Unescape View File

@ -62,7 +62,7 @@ cc_library(
"//upb:message_types",
"//upb:mini_table",
"//upb:wire",
"//upb:wire_types",
"//upb:wire_reader",
"@com_google_absl//absl/status",
"@com_google_absl//absl/status:statusor",
"@com_google_absl//absl/strings",

1
python/BUILD.bazel
Unescape View File

@ -200,7 +200,6 @@ py_extension(
"//upb:reflection",
"//upb:text",
"//upb:wire_reader",
"//upb:wire_types",
"//upb/util:compare",
"//upb/util:def_to_proto",
"//upb/util:required_fields",

19
upb/BUILD
Unescape View File

@ -117,7 +117,6 @@ cc_library(
":mini_descriptor",
":mini_table",
":wire",
":wire_internal",
],
)
@ -327,24 +326,12 @@ alias(
visibility = ["//visibility:public"],
)
alias(
name = "wire_internal",
actual = "//upb/wire:internal",
visibility = ["//visibility:public"],
)
alias(
name = "wire_reader",
actual = "//upb/wire:reader",
visibility = ["//visibility:public"],
)
alias(
name = "wire_types",
actual = "//upb/wire:types",
visibility = ["//visibility:public"],
)
alias(
name = "eps_copy_input_stream",
actual = "//upb/wire:eps_copy_input_stream",
@ -407,9 +394,7 @@ upb_amalgamation(
":reflection",
":reflection_internal",
":wire",
":wire_internal",
":wire_reader",
":wire_types",
],
strip_import_prefix = ["src"],
)
@ -455,9 +440,7 @@ upb_amalgamation(
":reflection",
":reflection_internal",
":wire",
":wire_internal",
":wire_reader",
":wire_types",
],
prefix = "php-",
strip_import_prefix = ["src"],
@ -504,9 +487,7 @@ upb_amalgamation(
":reflection",
":reflection_internal",
":wire",
":wire_internal",
":wire_reader",
":wire_types",
],
prefix = "ruby-",
strip_import_prefix = ["src"],

2
upb/generated_code_support.h
Unescape View File

@ -27,8 +27,8 @@
#include "upb/mini_table/message.h"
#include "upb/mini_table/sub.h"
#include "upb/wire/decode.h"
#include "upb/wire/decode_fast.h"
#include "upb/wire/encode.h"
#include "upb/wire/internal/decode_fast.h"
// IWYU pragma: end_exports
#endif // UPB_GENERATED_CODE_SUPPORT_H_

2
upb/message/BUILD
Unescape View File

@ -33,7 +33,6 @@ cc_library(
":message",
":tagged_ptr",
"//upb:base",
"//upb:eps_copy_input_stream",
"//upb:mem",
"//upb:message_types",
"//upb:mini_table",
@ -181,7 +180,6 @@ cc_library(
"//upb:mini_table",
"//upb:port",
"//upb:wire",
"//upb:wire_internal",
"//upb:wire_reader",
],
)

1
upb/mini_table/BUILD
Unescape View File

@ -40,7 +40,6 @@ cc_library(
"//upb:base",
"//upb:hash",
"//upb:mem",
"//upb:message_types",
"//upb:port",
],
)

4
upb/mini_table/internal/message.h
Unescape View File

@ -10,7 +10,6 @@
#include <stdint.h>
#include "upb/message/types.h"
#include "upb/mini_table/internal/field.h"
#include "upb/mini_table/internal/sub.h"
#include "upb/mini_table/types.h"
@ -19,8 +18,9 @@
#include "upb/port/def.inc"
struct upb_Decoder;
struct upb_Message;
typedef const char* _upb_FieldParser(struct upb_Decoder* d, const char* ptr,
upb_Message* msg, intptr_t table,
struct upb_Message* msg, intptr_t table,
uint64_t hasbits, uint64_t data);
typedef struct {
uint64_t field_data;

1
upb/text/BUILD
Unescape View File

@ -26,7 +26,6 @@ cc_library(
"//upb:reflection",
"//upb:wire",
"//upb:wire_reader",
"//upb:wire_types",
],
)

5
upb/util/BUILD
Unescape View File

@ -153,7 +153,6 @@ cc_library(
"//upb:mem",
"//upb:port",
"//upb:wire_reader",
"//upb:wire_types",
],
)
@ -163,8 +162,8 @@ cc_test(
deps = [
":compare",
"@com_google_googletest//:gtest_main",
"//upb:wire_internal",
"//upb:wire_types",
"//upb:port",
"//upb:wire_reader",
"@com_google_absl//absl/strings",
],
)

9
upb/util/compare_test.cc
Unescape View File

@ -15,9 +15,12 @@
#include <vector>
#include <gtest/gtest.h>
#include "upb/wire/internal/swap.h"
#include "upb/wire/internal/endian.h"
#include "upb/wire/types.h"
// Must be last.
#include "upb/port/def.inc"
struct UnknownField;
using UnknownFields = std::vector<UnknownField>;
@ -81,11 +84,11 @@ std::string ToBinaryPayload(const UnknownFields& fields) {
ret.append(val->val);
} else if (const auto* val = std::get_if<Fixed64>(&field.value)) {
EncodeVarint(field.field_number << 3 | kUpb_WireType_64Bit, &ret);
uint64_t swapped = _upb_BigEndian_Swap64(val->val);
uint64_t swapped = UPB_PRIVATE(_upb_BigEndian64)(val->val);
ret.append(reinterpret_cast<const char*>(&swapped), sizeof(swapped));
} else if (const auto* val = std::get_if<Fixed32>(&field.value)) {
EncodeVarint(field.field_number << 3 | kUpb_WireType_32Bit, &ret);
uint32_t swapped = _upb_BigEndian_Swap32(val->val);
uint32_t swapped = UPB_PRIVATE(_upb_BigEndian32)(val->val);
ret.append(reinterpret_cast<const char*>(&swapped), sizeof(swapped));
} else if (const auto* val = std::get_if<Group>(&field.value)) {
EncodeVarint(field.field_number << 3 | kUpb_WireType_StartGroup, &ret);

46
upb/wire/BUILD
Unescape View File

@ -9,45 +9,23 @@ load("//bazel:build_defs.bzl", "UPB_DEFAULT_COPTS")
cc_library(
name = "wire",
srcs = [
],
hdrs = [
"decode.h",
"encode.h",
],
copts = UPB_DEFAULT_COPTS,
visibility = ["//visibility:public"],
deps = [
":internal",
":types",
"//upb:mem",
"//upb:message",
"//upb:mini_table",
"//upb:port",
],
)
cc_library(
name = "internal",
srcs = [
"decode.c",
"decode.h",
"decode_fast.c",
"encode.c",
"encode.h",
"internal/decode_fast.c",
],
hdrs = [
"decode_fast.h",
"decode.h",
"encode.h",
"internal/constants.h",
"internal/decode.h",
"internal/swap.h",
"internal/decode_fast.h",
],
copts = UPB_DEFAULT_COPTS,
visibility = ["//visibility:public"],
deps = [
":eps_copy_input_stream",
":reader",
":types",
"//upb:base",
"//upb:hash",
"//upb:mem",
@ -56,6 +34,7 @@ cc_library(
"//upb:message_internal",
"//upb:message_internal_types",
"//upb:message_tagged_ptr",
"//upb:message_types",
"//upb:mini_table",
"//upb:port",
"//third_party/utf8_range",
@ -65,24 +44,21 @@ cc_library(
cc_library(
name = "reader",
srcs = [
"internal/swap.h",
"reader.c",
],
hdrs = ["reader.h"],
hdrs = [
"internal/endian.h",
"internal/reader.h",
"reader.h",
"types.h",
],
visibility = ["//visibility:public"],
deps = [
":eps_copy_input_stream",
":types",
"//upb:port",
],
)
cc_library(
name = "types",
hdrs = ["types.h"],
visibility = ["//visibility:public"],
)
cc_library(
name = "eps_copy_input_stream",
srcs = ["eps_copy_input_stream.c"],

9
upb/wire/decode.c
Unescape View File

@ -31,6 +31,7 @@
#include "upb/mini_table/extension.h"
#include "upb/mini_table/extension_registry.h"
#include "upb/mini_table/field.h"
#include "upb/mini_table/internal/field.h"
#include "upb/mini_table/internal/size_log2.h"
#include "upb/mini_table/message.h"
#include "upb/mini_table/sub.h"
@ -39,7 +40,7 @@
#include "upb/wire/eps_copy_input_stream.h"
#include "upb/wire/internal/constants.h"
#include "upb/wire/internal/decode.h"
#include "upb/wire/internal/swap.h"
#include "upb/wire/internal/endian.h"
#include "upb/wire/reader.h"
// Must be last.
@ -209,7 +210,7 @@ static const char* upb_Decoder_DecodeSize(upb_Decoder* d, const char* ptr,
}
static void _upb_Decoder_MungeInt32(wireval* val) {
if (!_upb_IsLittleEndian()) {
if (!UPB_PRIVATE(_upb_IsLittleEndian)()) {
/* The next stage will memcpy(dst, &val, 4) */
val->uint32_val = val->uint64_val;
}
@ -429,7 +430,7 @@ static const char* _upb_Decoder_DecodeFixedPacked(
arr->UPB_PRIVATE(size) += count;
// Note: if/when the decoder supports multi-buffer input, we will need to
// handle buffer seams here.
if (_upb_IsLittleEndian()) {
if (UPB_PRIVATE(_upb_IsLittleEndian)()) {
ptr = upb_EpsCopyInputStream_Copy(&d->input, ptr, mem, val->size);
} else {
int delta = upb_EpsCopyInputStream_PushLimit(&d->input, ptr, val->size);
@ -753,7 +754,7 @@ const char* _upb_Decoder_CheckRequired(upb_Decoder* d, const char* ptr,
}
uint64_t msg_head;
memcpy(&msg_head, msg, 8);
msg_head = _upb_BigEndian_Swap64(msg_head);
msg_head = UPB_PRIVATE(_upb_BigEndian64)(msg_head);
if (UPB_PRIVATE(_upb_MiniTable_RequiredMask)(m) & ~msg_head) {
d->missing_required = true;
}

15
upb/wire/encode.c
Unescape View File

@ -31,10 +31,11 @@
#include "upb/message/tagged_ptr.h"
#include "upb/mini_table/extension.h"
#include "upb/mini_table/field.h"
#include "upb/mini_table/internal/field.h"
#include "upb/mini_table/message.h"
#include "upb/mini_table/sub.h"
#include "upb/wire/internal/constants.h"
#include "upb/wire/internal/swap.h"
#include "upb/wire/internal/endian.h"
#include "upb/wire/types.h"
// Must be last.
@ -127,12 +128,12 @@ static void encode_bytes(upb_encstate* e, const void* data, size_t len) {
}
static void encode_fixed64(upb_encstate* e, uint64_t val) {
val = _upb_BigEndian_Swap64(val);
val = UPB_PRIVATE(_upb_BigEndian64)(val);
encode_bytes(e, &val, sizeof(uint64_t));
}
static void encode_fixed32(upb_encstate* e, uint32_t val) {
val = _upb_BigEndian_Swap32(val);
val = UPB_PRIVATE(_upb_BigEndian32)(val);
encode_bytes(e, &val, sizeof(uint32_t));
}
@ -183,18 +184,18 @@ static void encode_fixedarray(upb_encstate* e, const upb_Array* arr,
const char* data = _upb_array_constptr(arr);
const char* ptr = data + bytes - elem_size;
if (tag || !_upb_IsLittleEndian()) {
if (tag || !UPB_PRIVATE(_upb_IsLittleEndian)()) {
while (true) {
if (elem_size == 4) {
uint32_t val;
memcpy(&val, ptr, sizeof(val));
val = _upb_BigEndian_Swap32(val);
val = UPB_PRIVATE(_upb_BigEndian32)(val);
encode_bytes(e, &val, elem_size);
} else {
UPB_ASSERT(elem_size == 8);
uint64_t val;
memcpy(&val, ptr, sizeof(val));
val = _upb_BigEndian_Swap64(val);
val = UPB_PRIVATE(_upb_BigEndian64)(val);
encode_bytes(e, &val, elem_size);
}
@ -548,7 +549,7 @@ static void encode_message(upb_encstate* e, const upb_Message* msg,
m->UPB_PRIVATE(required_count)) {
uint64_t msg_head;
memcpy(&msg_head, msg, 8);
msg_head = _upb_BigEndian_Swap64(msg_head);
msg_head = UPB_PRIVATE(_upb_BigEndian64)(msg_head);
if (UPB_PRIVATE(_upb_MiniTable_RequiredMask)(m) & ~msg_head) {
encode_err(e, kUpb_EncodeStatus_MissingRequired);
}

1
upb/wire/encode.h
Unescape View File

@ -14,6 +14,7 @@
#include <stdint.h>
#include "upb/mem/arena.h"
#include "upb/message/types.h"
#include "upb/mini_table/message.h"
// Must be last.

2
upb/wire/decode_fast.c → upb/wire/internal/decode_fast.c
Unescape View File

@ -15,7 +15,7 @@
// field type (eg. oneof boolean field with a 1 byte tag) and then dispatch
// to the specialized function as quickly as possible.
#include "upb/wire/decode_fast.h"
#include "upb/wire/internal/decode_fast.h"
#include "upb/message/array.h"
#include "upb/message/internal/array.h"

6
upb/wire/decode_fast.h → upb/wire/internal/decode_fast.h
Unescape View File

@ -39,8 +39,8 @@
// - '1' for one-byte tags (field numbers 1-15)
// - '2' for two-byte tags (field numbers 16-2048)
#ifndef UPB_WIRE_DECODE_FAST_H_
#define UPB_WIRE_DECODE_FAST_H_
#ifndef UPB_WIRE_DECODE_INTERNAL_FAST_H_
#define UPB_WIRE_DECODE_INTERNAL_FAST_H_
#include "upb/message/message.h"
@ -144,4 +144,4 @@ TAGBYTES(r)
#include "upb/port/undef.inc"
#endif /* UPB_WIRE_DECODE_FAST_H_ */
#endif /* UPB_WIRE_DECODE_INTERNAL_FAST_H_ */

22
upb/wire/internal/swap.h → upb/wire/internal/endian.h
Unescape View File

@ -5,8 +5,8 @@
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
#ifndef UPB_WIRE_INTERNAL_SWAP_H_
#define UPB_WIRE_INTERNAL_SWAP_H_
#ifndef UPB_WIRE_INTERNAL_ENDIAN_H_
#define UPB_WIRE_INTERNAL_ENDIAN_H_
#include <stdint.h>
@ -17,23 +17,23 @@
extern "C" {
#endif
UPB_INLINE bool _upb_IsLittleEndian(void) {
int x = 1;
UPB_INLINE bool UPB_PRIVATE(_upb_IsLittleEndian)(void) {
const int x = 1;
return *(char*)&x == 1;
}
UPB_INLINE uint32_t _upb_BigEndian_Swap32(uint32_t val) {
if (_upb_IsLittleEndian()) return val;
UPB_INLINE uint32_t UPB_PRIVATE(_upb_BigEndian32)(uint32_t val) {
if (UPB_PRIVATE(_upb_IsLittleEndian)()) return val;
return ((val & 0xff) << 24) | ((val & 0xff00) << 8) |
((val & 0xff0000) >> 8) | ((val & 0xff000000) >> 24);
}
UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) {
if (_upb_IsLittleEndian()) return val;
UPB_INLINE uint64_t UPB_PRIVATE(_upb_BigEndian64)(uint64_t val) {
if (UPB_PRIVATE(_upb_IsLittleEndian)()) return val;
return ((uint64_t)_upb_BigEndian_Swap32((uint32_t)val) << 32) |
_upb_BigEndian_Swap32((uint32_t)(val >> 32));
return ((uint64_t)UPB_PRIVATE(_upb_BigEndian32)((uint32_t)val) << 32) |
UPB_PRIVATE(_upb_BigEndian32)((uint32_t)(val >> 32));
}
#ifdef __cplusplus
@ -42,4 +42,4 @@ UPB_INLINE uint64_t _upb_BigEndian_Swap64(uint64_t val) {
#include "upb/port/undef.inc"
#endif /* UPB_WIRE_INTERNAL_SWAP_H_ */
#endif /* UPB_WIRE_INTERNAL_ENDIAN_H_ */

61
upb/wire/internal/reader.h
Unescape View File

@ -0,0 +1,61 @@
// Protocol Buffers - Google's data interchange format
// Copyright 2023 Google LLC. All rights reserved.
//
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file or at
// https://developers.google.com/open-source/licenses/bsd
#ifndef UPB_WIRE_INTERNAL_READER_H_
#define UPB_WIRE_INTERNAL_READER_H_
// Must be last.
#include "upb/port/def.inc"
#define kUpb_WireReader_WireTypeBits 3
#define kUpb_WireReader_WireTypeMask 7
typedef struct {
const char* ptr;
uint64_t val;
} UPB_PRIVATE(_upb_WireReader_LongVarint);
#ifdef __cplusplus
extern "C" {
#endif
UPB_PRIVATE(_upb_WireReader_LongVarint)
UPB_PRIVATE(_upb_WireReader_ReadLongVarint)(const char* ptr, uint64_t val);
static UPB_FORCEINLINE const char* UPB_PRIVATE(_upb_WireReader_ReadVarint)(
const char* ptr, uint64_t* val, int maxlen, uint64_t maxval) {
uint64_t byte = (uint8_t)*ptr;
if (UPB_LIKELY((byte & 0x80) == 0)) {
*val = (uint32_t)byte;
return ptr + 1;
}
const char* start = ptr;
UPB_PRIVATE(_upb_WireReader_LongVarint)
res = UPB_PRIVATE(_upb_WireReader_ReadLongVarint)(ptr, byte);
if (!res.ptr || (maxlen < 10 && res.ptr - start > maxlen) ||
res.val > maxval) {
return NULL; // Malformed.
}
*val = res.val;
return res.ptr;
}
UPB_INLINE uint32_t UPB_PRIVATE(_upb_WireReader_GetFieldNumber)(uint32_t tag) {
return tag >> kUpb_WireReader_WireTypeBits;
}
UPB_INLINE uint8_t UPB_PRIVATE(_upb_WireReader_GetWireType)(uint32_t tag) {
return tag & kUpb_WireReader_WireTypeMask;
}
#ifdef __cplusplus
} /* extern "C" */
#endif
#include "upb/port/undef.inc"
#endif // UPB_WIRE_INTERNAL_READER_H_

15
upb/wire/reader.c
Unescape View File

@ -7,15 +7,18 @@
#include "upb/wire/reader.h"
#include <stddef.h>
#include <stdint.h>
#include "upb/wire/eps_copy_input_stream.h"
#include "upb/wire/types.h"
// Must be last.
#include "upb/port/def.inc"
UPB_NOINLINE _upb_WireReader_ReadLongVarintRet
_upb_WireReader_ReadLongVarint(const char* ptr, uint64_t val) {
_upb_WireReader_ReadLongVarintRet ret = {NULL, 0};
UPB_NOINLINE UPB_PRIVATE(_upb_WireReader_LongVarint)
UPB_PRIVATE(_upb_WireReader_ReadLongVarint)(const char* ptr, uint64_t val) {
UPB_PRIVATE(_upb_WireReader_LongVarint) ret = {NULL, 0};
uint64_t byte;
int i;
for (i = 1; i < 10; i++) {
@ -30,9 +33,9 @@ _upb_WireReader_ReadLongVarint(const char* ptr, uint64_t val) {
return ret;
}
const char* _upb_WireReader_SkipGroup(const char* ptr, uint32_t tag,
int depth_limit,
upb_EpsCopyInputStream* stream) {
const char* UPB_PRIVATE(_upb_WireReader_SkipGroup)(
const char* ptr, uint32_t tag, int depth_limit,
upb_EpsCopyInputStream* stream) {
if (--depth_limit == 0) return NULL;
uint32_t end_group_tag = (tag & ~7ULL) | kUpb_WireType_EndGroup;
while (!upb_EpsCopyInputStream_IsDone(stream, &ptr)) {

65
upb/wire/reader.h
Unescape View File

@ -9,52 +9,22 @@
#define UPB_WIRE_READER_H_
#include "upb/wire/eps_copy_input_stream.h"
#include "upb/wire/internal/swap.h"
#include "upb/wire/internal/endian.h"
#include "upb/wire/internal/reader.h"
#include "upb/wire/types.h" // IWYU pragma: export
// Must be last.
#include "upb/port/def.inc"
#ifdef __cplusplus
extern "C" {
#endif
// The upb_WireReader interface is suitable for general-purpose parsing of
// protobuf binary wire format. It is designed to be used along with
// protobuf binary wire format. It is designed to be used along with
// upb_EpsCopyInputStream for buffering, and all parsing routines in this file
// assume that at least kUpb_EpsCopyInputStream_SlopBytes worth of data is
// available to read without any bounds checks.
#define kUpb_WireReader_WireTypeMask 7
#define kUpb_WireReader_WireTypeBits 3
typedef struct {
const char* ptr;
uint64_t val;
} _upb_WireReader_ReadLongVarintRet;
_upb_WireReader_ReadLongVarintRet _upb_WireReader_ReadLongVarint(
const char* ptr, uint64_t val);
static UPB_FORCEINLINE const char* _upb_WireReader_ReadVarint(const char* ptr,
uint64_t* val,
int maxlen,
uint64_t maxval) {
uint64_t byte = (uint8_t)*ptr;
if (UPB_LIKELY((byte & 0x80) == 0)) {
*val = (uint32_t)byte;
return ptr + 1;
}
const char* start = ptr;
_upb_WireReader_ReadLongVarintRet res =
_upb_WireReader_ReadLongVarint(ptr, byte);
if (!res.ptr || (maxlen < 10 && res.ptr - start > maxlen) ||
res.val > maxval) {
return NULL; // Malformed.
}
*val = res.val;
return res.ptr;
}
#ifdef __cplusplus
extern "C" {
#endif
// Parses a tag into `tag`, and returns a pointer past the end of the tag, or
// NULL if there was an error in the tag data.
@ -65,7 +35,7 @@ static UPB_FORCEINLINE const char* _upb_WireReader_ReadVarint(const char* ptr,
static UPB_FORCEINLINE const char* upb_WireReader_ReadTag(const char* ptr,
uint32_t* tag) {
uint64_t val;
ptr = _upb_WireReader_ReadVarint(ptr, &val, 5, UINT32_MAX);
ptr = UPB_PRIVATE(_upb_WireReader_ReadVarint)(ptr, &val, 5, UINT32_MAX);
if (!ptr) return NULL;
*tag = val;
return ptr;
@ -73,17 +43,17 @@ static UPB_FORCEINLINE const char* upb_WireReader_ReadTag(const char* ptr,
// Given a tag, returns the field number.
UPB_INLINE uint32_t upb_WireReader_GetFieldNumber(uint32_t tag) {
return tag >> kUpb_WireReader_WireTypeBits;
return UPB_PRIVATE(_upb_WireReader_GetFieldNumber)(tag);
}
// Given a tag, returns the wire type.
UPB_INLINE uint8_t upb_WireReader_GetWireType(uint32_t tag) {
return tag & kUpb_WireReader_WireTypeMask;
return UPB_PRIVATE(_upb_WireReader_GetWireType)(tag);
}
UPB_INLINE const char* upb_WireReader_ReadVarint(const char* ptr,
uint64_t* val) {
return _upb_WireReader_ReadVarint(ptr, val, 10, UINT64_MAX);
return UPB_PRIVATE(_upb_WireReader_ReadVarint)(ptr, val, 10, UINT64_MAX);
}
// Skips data for a varint, returning a pointer past the end of the varint, or
@ -119,7 +89,7 @@ UPB_INLINE const char* upb_WireReader_ReadSize(const char* ptr, int* size) {
UPB_INLINE const char* upb_WireReader_ReadFixed32(const char* ptr, void* val) {
uint32_t uval;
memcpy(&uval, ptr, 4);
uval = _upb_BigEndian_Swap32(uval);
uval = UPB_PRIVATE(_upb_BigEndian32)(uval);
memcpy(val, &uval, 4);
return ptr + 4;
}
@ -132,14 +102,14 @@ UPB_INLINE const char* upb_WireReader_ReadFixed32(const char* ptr, void* val) {
UPB_INLINE const char* upb_WireReader_ReadFixed64(const char* ptr, void* val) {
uint64_t uval;
memcpy(&uval, ptr, 8);
uval = _upb_BigEndian_Swap64(uval);
uval = UPB_PRIVATE(_upb_BigEndian64)(uval);
memcpy(val, &uval, 8);
return ptr + 8;
}
const char* _upb_WireReader_SkipGroup(const char* ptr, uint32_t tag,
int depth_limit,
upb_EpsCopyInputStream* stream);
const char* UPB_PRIVATE(_upb_WireReader_SkipGroup)(
const char* ptr, uint32_t tag, int depth_limit,
upb_EpsCopyInputStream* stream);
// Skips data for a group, returning a pointer past the end of the group, or
// NULL if there was an error parsing the group. The `tag` argument should be
@ -152,7 +122,7 @@ const char* _upb_WireReader_SkipGroup(const char* ptr, uint32_t tag,
// control over this?
UPB_INLINE const char* upb_WireReader_SkipGroup(
const char* ptr, uint32_t tag, upb_EpsCopyInputStream* stream) {
return _upb_WireReader_SkipGroup(ptr, tag, 100, stream);
return UPB_PRIVATE(_upb_WireReader_SkipGroup)(ptr, tag, 100, stream);
}
UPB_INLINE const char* _upb_WireReader_SkipValue(
@ -173,7 +143,8 @@ UPB_INLINE const char* _upb_WireReader_SkipValue(
return ptr;
}
case kUpb_WireType_StartGroup:
return _upb_WireReader_SkipGroup(ptr, tag, depth_limit, stream);
return UPB_PRIVATE(_upb_WireReader_SkipGroup)(ptr, tag, depth_limit,
stream);
case kUpb_WireType_EndGroup:
return NULL; // Should be handled before now.
default:

4
upb_generator/BUILD
Unescape View File

@ -266,7 +266,7 @@ bootstrap_cc_binary(
"//upb:base",
"//upb:mem",
"//upb:port",
"//upb:wire_types",
"//upb:wire_reader",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/log:absl_check",
@ -305,7 +305,7 @@ bootstrap_cc_binary(
"//upb:mem",
"//upb:mini_table",
"//upb:port",
"//upb:wire_types",
"//upb:wire_reader",
"@com_google_absl//absl/container:flat_hash_map",
"@com_google_absl//absl/container:flat_hash_set",
"@com_google_absl//absl/log:absl_check",

Write Preview
Loading…
Cancel
Save