From 7303758dd2b65e3c7c657c5fead93a13d0fe30f5 Mon Sep 17 00:00:00 2001
From: Eric Salo <salo@google.com>
Date: Mon, 29 Jan 2024 12:10:27 -0800
Subject: [PATCH] upb: factor out Java code for reading upb_Array data

PiperOrigin-RevId: 602461889
---
 upb/base/string_view.h       | 2 +-
 upb/message/internal/array.h | 7 +++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/upb/base/string_view.h b/upb/base/string_view.h
index 2a7fe37329..e4d79e680b 100644
--- a/upb/base/string_view.h
+++ b/upb/base/string_view.h
@@ -46,7 +46,7 @@ UPB_INLINE bool upb_StringView_IsEqual(upb_StringView a, upb_StringView b) {
 }
 
 // LINT.ThenChange(
-//  GoogleInternalName0,
+//  GoogleInternalName1,
 //  //depot/google3/third_party/upb/bits/golang/accessor.go:map_go_string,
 //  //depot/google3/third_party/upb/bits/typescript/string_view.ts
 // )
diff --git a/upb/message/internal/array.h b/upb/message/internal/array.h
index 21a8256324..28052e126e 100644
--- a/upb/message/internal/array.h
+++ b/upb/message/internal/array.h
@@ -24,7 +24,8 @@
 extern "C" {
 #endif
 
-// LINT.IfChange(struct_definition)
+// LINT.IfChange(upb_Array)
+
 // Our internal representation for repeated fields.
 struct upb_Array {
   // This is a tagged pointer. Bits #0 and #1 encode the elem size as follows:
@@ -131,9 +132,7 @@ UPB_INLINE size_t UPB_PRIVATE(_upb_Array_Size)(const struct upb_Array* arr) {
   return arr->UPB_ONLYBITS(size);
 }
 
-// LINT.ThenChange(
-//  GoogleInternalName1,
-//)
+// LINT.ThenChange(GoogleInternalName0)
 
 #ifdef __cplusplus
 } /* extern "C" */