grpc 1.54.2 → 1.56.0.pre3

data/third_party/upb/upb/reflection.hpp

@@ -23,15 +23,11 @@
 // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
 // SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+// This header is deprecated, use upb/reflection/message.hpp instead
+
 #ifndef UPB_REFLECTION_HPP_
 #define UPB_REFLECTION_HPP_
 
-#include "upb/reflection.h"
-
-namespace upb {
-
-typedef upb_MessageValue MessageValue;
-
-}  // namespace upb
+#include "upb/reflection/message.hpp"
 
 #endif  // UPB_REFLECTION_HPP_

data/third_party/upb/upb/status.h

@@ -25,42 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// This header is deprecated, use upb/base/status.h instead
+// IWYU pragma: private, include "upb/base/status.h"
+
 #ifndef UPB_STATUS_H_
 #define UPB_STATUS_H_
 
-#include <stdarg.h>
-#include <stdbool.h>
-
-#include "upb/port_def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-#define _kUpb_Status_MaxMessage 127
-
-typedef struct {
-  bool ok;
-  char msg[_kUpb_Status_MaxMessage]; /* Error message; NULL-terminated. */
-} upb_Status;
-
-const char* upb_Status_ErrorMessage(const upb_Status* status);
-bool upb_Status_IsOk(const upb_Status* status);
-
-/* These are no-op if |status| is NULL. */
-void upb_Status_Clear(upb_Status* status);
-void upb_Status_SetErrorMessage(upb_Status* status, const char* msg);
-void upb_Status_SetErrorFormat(upb_Status* status, const char* fmt, ...)
-    UPB_PRINTF(2, 3);
-void upb_Status_VSetErrorFormat(upb_Status* status, const char* fmt,
-                                va_list args) UPB_PRINTF(2, 0);
-void upb_Status_VAppendErrorFormat(upb_Status* status, const char* fmt,
-                                   va_list args) UPB_PRINTF(2, 0);
-
-#include "upb/port_undef.inc"
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+#include "upb/base/status.h"
 
 #endif /* UPB_STATUS_H_ */

data/third_party/upb/upb/{collections.h → string_view.h}

@@ -25,12 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef UPB_COLLECTIONS_H_
-#define UPB_COLLECTIONS_H_
+// This header is deprecated, use upb/base/string_view.h instead
+// IWYU pragma: private, include "upb/base/string_view.h"
 
-// TODO(b/232091617): Delete this entire header which currently exists only for
-// temporary backwards compatibility.
-#include "upb/array.h"
-#include "upb/map.h"
+#ifndef UPB_STRING_VIEW_H_
+#define UPB_STRING_VIEW_H_
 
-#endif /* UPB_COLLECTIONS_H_ */
+#include "upb/base/string_view.h"
+
+#endif /* UPB_STRING_VIEW_H_ */

data/third_party/upb/upb/{text_encode.c → text/encode.c}

@@ -25,21 +25,25 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "upb/text_encode.h"
+#include "upb/text/encode.h"
 
 #include <ctype.h>
 #include <float.h>
 #include <inttypes.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <string.h>
 
-#include "upb/internal/upb.h"
-#include "upb/internal/vsnprintf_compat.h"
-#include "upb/reflection.h"
+#include "upb/collections/map.h"
+#include "upb/collections/map_sorter_internal.h"
+#include "upb/lex/round_trip.h"
+#include "upb/port/vsnprintf_compat.h"
+#include "upb/reflection/message.h"
+#include "upb/wire/eps_copy_input_stream.h"
+#include "upb/wire/reader.h"
+#include "upb/wire/types.h"
 
 // Must be last.
-#include "upb/port_def.inc"
+#include "upb/port/def.inc"
 
 typedef struct {
   char *buf, *ptr, *end;
@@ -158,11 +162,17 @@ static void txtenc_string(txtenc* e, upb_StringView str, bool bytes) {
 static void txtenc_field(txtenc* e, upb_MessageValue val,
                          const upb_FieldDef* f) {
   txtenc_indent(e);
-  upb_CType type = upb_FieldDef_CType(f);
+  const upb_CType type = upb_FieldDef_CType(f);
+  const bool is_ext = upb_FieldDef_IsExtension(f);
+  const char* full = upb_FieldDef_FullName(f);
   const char* name = upb_FieldDef_Name(f);
 
   if (type == kUpb_CType_Message) {
-    txtenc_printf(e, "%s {", name);
+    if (is_ext) {
+      txtenc_printf(e, "[%s] {", full);
+    } else {
+      txtenc_printf(e, "%s {", name);
+    }
     txtenc_endfield(e);
     e->indent_depth++;
     txtenc_msg(e, val.msg_val, upb_FieldDef_MessageSubDef(f));
@@ -173,7 +183,11 @@ static void txtenc_field(txtenc* e, upb_MessageValue val,
     return;
   }
 
-  txtenc_printf(e, "%s: ", name);
+  if (is_ext) {
+    txtenc_printf(e, "[%s]: ", full);
+  } else {
+    txtenc_printf(e, "%s: ", name);
+  }
 
   switch (type) {
     case kUpb_CType_Bool:
@@ -270,9 +284,8 @@ static void txtenc_mapentry(txtenc* e, upb_MessageValue key,
 static void txtenc_map(txtenc* e, const upb_Map* map, const upb_FieldDef* f) {
   if (e->options & UPB_TXTENC_NOSORT) {
     size_t iter = kUpb_Map_Begin;
-    while (upb_MapIterator_Next(map, &iter)) {
-      upb_MessageValue key = upb_MapIterator_Key(map, iter);
-      upb_MessageValue val = upb_MapIterator_Value(map, iter);
+    upb_MessageValue key, val;
+    while (upb_Map_Next(map, &key, &val, &iter)) {
       txtenc_mapentry(e, key, val, f);
     }
   } else {
@@ -284,8 +297,8 @@ static void txtenc_map(txtenc* e, const upb_Map* map, const upb_FieldDef* f) {
     _upb_mapsorter_pushmap(&e->sorter, upb_FieldDef_Type(key_f), map, &sorted);
     while (_upb_sortedmap_next(&e->sorter, map, &sorted, &ent)) {
       upb_MessageValue key, val;
-      memcpy(&key, &ent.k, sizeof(key));
-      memcpy(&val, &ent.v, sizeof(val));
+      memcpy(&key, &ent.data.k, sizeof(key));
+      memcpy(&val, &ent.data.v, sizeof(val));
       txtenc_mapentry(e, key, val, f);
     }
     _upb_mapsorter_popmap(&e->sorter, &sorted);
@@ -299,23 +312,6 @@ static void txtenc_map(txtenc* e, const upb_Map* map, const upb_FieldDef* f) {
     }               \
   } while (0)
 
-static const char* txtenc_parsevarint(const char* ptr, const char* limit,
-                                      uint64_t* val) {
-  uint8_t byte;
-  int bitpos = 0;
-  *val = 0;
-
-  do {
-    CHK(bitpos < 70 && ptr < limit);
-    byte = *ptr;
-    *val |= (uint64_t)(byte & 0x7F) << bitpos;
-    ptr++;
-    bitpos += 7;
-  } while (byte & 0x80);
-
-  return ptr;
-}
-
 /*
  * Unknown fields are printed by number.
  *
@@ -326,89 +322,95 @@ static const char* txtenc_parsevarint(const char* ptr, const char* limit,
  *   1: 111
  * }
  */
-static const char* txtenc_unknown(txtenc* e, const char* ptr, const char* end,
+static const char* txtenc_unknown(txtenc* e, const char* ptr,
+                                  upb_EpsCopyInputStream* stream,
                                   int groupnum) {
-  while (ptr < end) {
-    uint64_t tag_64;
+  // We are guaranteed that the unknown data is valid wire format, and will not
+  // contain tag zero.
+  uint32_t end_group = groupnum > 0
+                           ? ((groupnum << kUpb_WireReader_WireTypeBits) |
+                              kUpb_WireType_EndGroup)
+                           : 0;
+
+  while (!upb_EpsCopyInputStream_IsDone(stream, &ptr)) {
     uint32_t tag;
-    CHK(ptr = txtenc_parsevarint(ptr, end, &tag_64));
-    CHK(tag_64 < UINT32_MAX);
-    tag = (uint32_t)tag_64;
-
-    if ((tag & 7) == kUpb_WireType_EndGroup) {
-      CHK((tag >> 3) == (uint32_t)groupnum);
-      return ptr;
-    }
+    CHK(ptr = upb_WireReader_ReadTag(ptr, &tag));
+    if (tag == end_group) return ptr;
 
     txtenc_indent(e);
-    txtenc_printf(e, "%d: ", (int)(tag >> 3));
+    txtenc_printf(e, "%d: ", (int)upb_WireReader_GetFieldNumber(tag));
 
-    switch (tag & 7) {
+    switch (upb_WireReader_GetWireType(tag)) {
       case kUpb_WireType_Varint: {
         uint64_t val;
-        CHK(ptr = txtenc_parsevarint(ptr, end, &val));
+        CHK(ptr = upb_WireReader_ReadVarint(ptr, &val));
         txtenc_printf(e, "%" PRIu64, val);
         break;
       }
       case kUpb_WireType_32Bit: {
         uint32_t val;
-        CHK(end - ptr >= 4);
-        memcpy(&val, ptr, 4);
-        ptr += 4;
+        ptr = upb_WireReader_ReadFixed32(ptr, &val);
         txtenc_printf(e, "0x%08" PRIu32, val);
         break;
       }
       case kUpb_WireType_64Bit: {
         uint64_t val;
-        CHK(end - ptr >= 8);
-        memcpy(&val, ptr, 8);
-        ptr += 8;
+        ptr = upb_WireReader_ReadFixed64(ptr, &val);
         txtenc_printf(e, "0x%016" PRIu64, val);
         break;
       }
       case kUpb_WireType_Delimited: {
-        uint64_t len;
-        size_t avail = end - ptr;
+        int size;
         char* start = e->ptr;
         size_t start_overflow = e->overflow;
-        CHK(ptr = txtenc_parsevarint(ptr, end, &len));
-        CHK(avail >= len);
+        CHK(ptr = upb_WireReader_ReadSize(ptr, &size));
+        CHK(upb_EpsCopyInputStream_CheckDataSizeAvailable(stream, ptr, size));
 
-        /* Speculatively try to parse as message. */
+        // Speculatively try to parse as message.
         txtenc_putstr(e, "{");
         txtenc_endfield(e);
+
+        // EpsCopyInputStream can't back up, so create a sub-stream for the
+        // speculative parse.
+        upb_EpsCopyInputStream sub_stream;
+        const char* sub_ptr = upb_EpsCopyInputStream_GetAliasedPtr(stream, ptr);
+        upb_EpsCopyInputStream_Init(&sub_stream, &sub_ptr, size, true);
+
         e->indent_depth++;
-        if (txtenc_unknown(e, ptr, end, -1)) {
+        if (txtenc_unknown(e, sub_ptr, &sub_stream, -1)) {
+          ptr = upb_EpsCopyInputStream_Skip(stream, ptr, size);
           e->indent_depth--;
           txtenc_indent(e);
           txtenc_putstr(e, "}");
         } else {
-          /* Didn't work out, print as raw bytes. */
-          upb_StringView str;
+          // Didn't work out, print as raw bytes.
           e->indent_depth--;
           e->ptr = start;
           e->overflow = start_overflow;
-          str.data = ptr;
-          str.size = len;
-          txtenc_string(e, str, true);
+          const char* str = ptr;
+          ptr = upb_EpsCopyInputStream_ReadString(stream, &str, size, NULL);
+          assert(ptr);
+          txtenc_string(e, (upb_StringView){.data = str, .size = size}, true);
         }
-        ptr += len;
         break;
       }
       case kUpb_WireType_StartGroup:
         txtenc_putstr(e, "{");
         txtenc_endfield(e);
         e->indent_depth++;
-        CHK(ptr = txtenc_unknown(e, ptr, end, tag >> 3));
+        CHK(ptr = txtenc_unknown(e, ptr, stream,
+                                 upb_WireReader_GetFieldNumber(tag)));
         e->indent_depth--;
         txtenc_indent(e);
         txtenc_putstr(e, "}");
         break;
+      default:
+        return NULL;
     }
     txtenc_endfield(e);
   }
 
-  return groupnum == -1 ? ptr : NULL;
+  return end_group == 0 && !upb_EpsCopyInputStream_IsError(stream) ? ptr : NULL;
 }
 
 #undef CHK
@@ -430,11 +432,13 @@ static void txtenc_msg(txtenc* e, const upb_Message* msg,
   }
 
   if ((e->options & UPB_TXTENC_SKIPUNKNOWN) == 0) {
-    size_t len;
-    const char* ptr = upb_Message_GetUnknown(msg, &len);
-    char* start = e->ptr;
-    if (ptr) {
-      if (!txtenc_unknown(e, ptr, ptr + len, -1)) {
+    size_t size;
+    const char* ptr = upb_Message_GetUnknown(msg, &size);
+    if (size != 0) {
+      char* start = e->ptr;
+      upb_EpsCopyInputStream stream;
+      upb_EpsCopyInputStream_Init(&stream, &ptr, size, true);
+      if (!txtenc_unknown(e, ptr, &stream, -1)) {
         /* Unknown failed to parse, back up and don't print it at all. */
         e->ptr = start;
       }

data/third_party/upb/upb/text/encode.h

@@ -0,0 +1,69 @@
+/*
+ * Copyright (c) 2009-2021, Google LLC
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *     * Redistributions of source code must retain the above copyright
+ *       notice, this list of conditions and the following disclaimer.
+ *     * Redistributions in binary form must reproduce the above copyright
+ *       notice, this list of conditions and the following disclaimer in the
+ *       documentation and/or other materials provided with the distribution.
+ *     * Neither the name of Google LLC nor the
+ *       names of its contributors may be used to endorse or promote products
+ *       derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL Google LLC BE LIABLE FOR ANY DIRECT,
+ * INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef UPB_TEXT_ENCODE_H_
+#define UPB_TEXT_ENCODE_H_
+
+#include "upb/reflection/def.h"
+
+// Must be last.
+#include "upb/port/def.inc"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum {
+  // When set, prints everything on a single line.
+  UPB_TXTENC_SINGLELINE = 1,
+
+  // When set, unknown fields are not printed.
+  UPB_TXTENC_SKIPUNKNOWN = 2,
+
+  // When set, maps are *not* sorted (this avoids allocating tmp mem).
+  UPB_TXTENC_NOSORT = 4
+};
+
+/* Encodes the given |msg| to text format.  The message's reflection is given in
+ * |m|.  The symtab in |symtab| is used to find extensions (if NULL, extensions
+ * will not be printed).
+ *
+ * Output is placed in the given buffer, and always NULL-terminated.  The output
+ * size (excluding NULL) is returned.  This means that a return value >= |size|
+ * implies that the output was truncated.  (These are the same semantics as
+ * snprintf()). */
+size_t upb_TextEncode(const upb_Message* msg, const upb_MessageDef* m,
+                      const upb_DefPool* ext_pool, int options, char* buf,
+                      size_t size);
+
+#ifdef __cplusplus
+} /* extern "C" */
+#endif
+
+#include "upb/port/undef.inc"
+
+#endif /* UPB_TEXT_ENCODE_H_ */

data/third_party/upb/upb/text_encode.h

@@ -25,40 +25,12 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
+// This header is deprecated, use upb/text/encode.h instead
+// IWYU pragma: private, include "upb/text/encode.h"
+
 #ifndef UPB_TEXTENCODE_H_
 #define UPB_TEXTENCODE_H_
 
-#include "upb/def.h"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-enum {
-  /* When set, prints everything on a single line. */
-  UPB_TXTENC_SINGLELINE = 1,
-
-  /* When set, unknown fields are not printed. */
-  UPB_TXTENC_SKIPUNKNOWN = 2,
-
-  /* When set, maps are *not* sorted (this avoids allocating tmp mem). */
-  UPB_TXTENC_NOSORT = 4
-};
-
-/* Encodes the given |msg| to text format.  The message's reflection is given in
- * |m|.  The symtab in |symtab| is used to find extensions (if NULL, extensions
- * will not be printed).
- *
- * Output is placed in the given buffer, and always NULL-terminated.  The output
- * size (excluding NULL) is returned.  This means that a return value >= |size|
- * implies that the output was truncated.  (These are the same semantics as
- * snprintf()). */
-size_t upb_TextEncode(const upb_Message* msg, const upb_MessageDef* m,
-                      const upb_DefPool* ext_pool, int options, char* buf,
-                      size_t size);
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+#include "upb/text/encode.h"
 
 #endif /* UPB_TEXTENCODE_H_ */

data/third_party/upb/upb/upb.h

@@ -25,160 +25,15 @@
  * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * This file contains shared definitions that are widely used across upb.
- */
+// This header is deprecated, use the individual #includes below as needed.
+// IWYU pragma: private, include "upb/base/status.h"
 
 #ifndef UPB_H_
 #define UPB_H_
 
-#include <assert.h>
-#include <stdarg.h>
-#include <stdbool.h>
-#include <stddef.h>
-#include <stdint.h>
-#include <string.h>
-
-// TODO(b/232091617): Remove these and fix everything that breaks as a result.
-#include "upb/arena.h"
-#include "upb/status.h"
-
-// Must be last.
-#include "upb/port_def.inc"
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/** upb_StringView ************************************************************/
-
-typedef struct {
-  const char* data;
-  size_t size;
-} upb_StringView;
-
-UPB_INLINE upb_StringView upb_StringView_FromDataAndSize(const char* data,
-                                                         size_t size) {
-  upb_StringView ret;
-  ret.data = data;
-  ret.size = size;
-  return ret;
-}
-
-UPB_INLINE upb_StringView upb_StringView_FromString(const char* data) {
-  return upb_StringView_FromDataAndSize(data, strlen(data));
-}
-
-UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) {
-  return a.size == b.size && memcmp(a.data, b.data, a.size) == 0;
-}
-
-#define UPB_STRINGVIEW_INIT(ptr, len) \
-  { ptr, len }
-
-#define UPB_STRINGVIEW_FORMAT "%.*s"
-#define UPB_STRINGVIEW_ARGS(view) (int)(view).size, (view).data
-
-/* Constants ******************************************************************/
-
-/* 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;
-
-/* The types a field can have.  Note that this list is not identical to the
- * types defined in descriptor.proto, which gives INT32 and SINT32 separate
- * types (we distinguish the two with the "integer encoding" enum below). */
-typedef enum {
-  kUpb_CType_Bool = 1,
-  kUpb_CType_Float = 2,
-  kUpb_CType_Int32 = 3,
-  kUpb_CType_UInt32 = 4,
-  kUpb_CType_Enum = 5, /* Enum values are int32. */
-  kUpb_CType_Message = 6,
-  kUpb_CType_Double = 7,
-  kUpb_CType_Int64 = 8,
-  kUpb_CType_UInt64 = 9,
-  kUpb_CType_String = 10,
-  kUpb_CType_Bytes = 11
-} upb_CType;
-
-/* The repeated-ness of each field; this matches descriptor.proto. */
-typedef enum {
-  kUpb_Label_Optional = 1,
-  kUpb_Label_Required = 2,
-  kUpb_Label_Repeated = 3
-} upb_Label;
-
-/* Descriptor types, as defined in descriptor.proto. */
-typedef enum {
-  kUpb_FieldType_Double = 1,
-  kUpb_FieldType_Float = 2,
-  kUpb_FieldType_Int64 = 3,
-  kUpb_FieldType_UInt64 = 4,
-  kUpb_FieldType_Int32 = 5,
-  kUpb_FieldType_Fixed64 = 6,
-  kUpb_FieldType_Fixed32 = 7,
-  kUpb_FieldType_Bool = 8,
-  kUpb_FieldType_String = 9,
-  kUpb_FieldType_Group = 10,
-  kUpb_FieldType_Message = 11,
-  kUpb_FieldType_Bytes = 12,
-  kUpb_FieldType_UInt32 = 13,
-  kUpb_FieldType_Enum = 14,
-  kUpb_FieldType_SFixed32 = 15,
-  kUpb_FieldType_SFixed64 = 16,
-  kUpb_FieldType_SInt32 = 17,
-  kUpb_FieldType_SInt64 = 18
-} upb_FieldType;
-
-#define kUpb_Map_Begin ((size_t)-1)
-
-UPB_INLINE bool _upb_IsLittleEndian(void) {
-  int x = 1;
-  return *(char*)&x == 1;
-}
-
-UPB_INLINE uint32_t _upb_BigEndian_Swap32(uint32_t val) {
-  if (_upb_IsLittleEndian()) {
-    return val;
-  } else {
-    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;
-  } else {
-    return ((uint64_t)_upb_BigEndian_Swap32((uint32_t)val) << 32) |
-           _upb_BigEndian_Swap32((uint32_t)(val >> 32));
-  }
-}
-
-UPB_INLINE int _upb_Log2Ceiling(int x) {
-  if (x <= 1) return 0;
-#ifdef __GNUC__
-  return 32 - __builtin_clz(x - 1);
-#else
-  int lg2 = 0;
-  while (1 << lg2 < x) lg2++;
-  return lg2;
-#endif
-}
-
-UPB_INLINE int _upb_Log2CeilingSize(int x) { return 1 << _upb_Log2Ceiling(x); }
-
-#include "upb/port_undef.inc"
-
-#ifdef __cplusplus
-} /* extern "C" */
-#endif
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/status.h"
+#include "upb/base/string_view.h"
+#include "upb/mem/arena.h"
 
 #endif /* UPB_H_ */

data/third_party/upb/upb/upb.hpp

@@ -28,7 +28,9 @@
 
 #include <memory>
 
-#include "upb/upb.h"
+#include "upb/base/descriptor_constants.h"
+#include "upb/base/status.h"
+#include "upb/mem/arena.h"
 
 namespace upb {
 
@@ -73,26 +75,11 @@ class Arena {
       : ptr_(upb_Arena_Init(initial_block, size, &upb_alloc_global),
              upb_Arena_Free) {}
 
-  upb_Arena* ptr() { return ptr_.get(); }
-
-  // Allows this arena to be used as a generic allocator.
-  //
-  // The arena does not need free() calls so when using Arena as an allocator
-  // it is safe to skip them.  However they are no-ops so there is no harm in
-  // calling free() either.
-  upb_alloc* allocator() { return upb_Arena_Alloc(ptr_.get()); }
-
-  // Add a cleanup function to run when the arena is destroyed.
-  // Returns false on out-of-memory.
-  template <class T>
-  bool Own(T* obj) {
-    return upb_Arena_AddCleanup(ptr_.get(), obj,
-                                [](void* obj) { delete static_cast<T*>(obj); });
-  }
+  upb_Arena* ptr() const { return ptr_.get(); }
 
   void Fuse(Arena& other) { upb_Arena_Fuse(ptr(), other.ptr()); }
 
- private:
+ protected:
   std::unique_ptr<upb_Arena, decltype(&upb_Arena_Free)> ptr_;
 };
 
@@ -102,6 +89,11 @@ template <int N>
 class InlinedArena : public Arena {
  public:
   InlinedArena() : Arena(initial_block_, N) {}
+  ~InlinedArena() {
+    // Explicitly destroy the arena now so that it does not outlive
+    // initial_block_.
+    ptr_.reset();
+  }
 
  private:
   InlinedArena(const InlinedArena*) = delete;