From 6b9d5c425e46eecd6b04b95bd5d3eb9056138e70 Mon Sep 17 00:00:00 2001
From: Hong Shin <hongshin@google.com>
Date: Wed, 20 Nov 2024 11:22:49 -0800
Subject: [PATCH] hpb: when parsing T*'s, delegate to the canonical Ptr<T>

PiperOrigin-RevId: 698458386
---
 hpb/hpb.h | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/hpb/hpb.h b/hpb/hpb.h
index 3becc509c304b..5591f674ac6f6 100644
--- a/hpb/hpb.h
+++ b/hpb/hpb.h
@@ -95,6 +95,11 @@ ABSL_MUST_USE_RESULT bool Parse(Ptr<T> message, absl::string_view bytes) {
                     arena) == kUpb_DecodeStatus_Ok;
 }
 
+template <typename T>
+ABSL_MUST_USE_RESULT bool Parse(T* message, absl::string_view bytes) {
+  return Parse(Ptr(message), bytes);
+}
+
 template <typename T>
 absl::StatusOr<T> Parse(absl::string_view bytes, int options = 0) {
   T message;
@@ -109,19 +114,6 @@ absl::StatusOr<T> Parse(absl::string_view bytes, int options = 0) {
   return MessageDecodeError(status);
 }
 
-template <typename T>
-ABSL_MUST_USE_RESULT bool Parse(T* message, absl::string_view bytes) {
-  static_assert(!std::is_const_v<T>);
-  upb_Message_Clear(hpb::interop::upb::GetMessage(message),
-                    ::hpb::interop::upb::GetMiniTable(message));
-  auto* arena = hpb::interop::upb::GetArena(message);
-  return upb_Decode(bytes.data(), bytes.size(),
-                    hpb::interop::upb::GetMessage(message),
-                    ::hpb::interop::upb::GetMiniTable(message),
-                    /* extreg= */ nullptr, /* options= */ 0,
-                    arena) == kUpb_DecodeStatus_Ok;
-}
-
 template <typename T>
 absl::StatusOr<T> Parse(absl::string_view bytes,
                         const ::hpb::ExtensionRegistry& extension_registry,