Skip to content

Commit

Permalink
Auto-generate files after cl/713147042
Browse files Browse the repository at this point in the history
  • Loading branch information
@protobuf-team-bot
protobuf-team-bot committed Jan 8, 2025
1 parent 98aab04 commit 4d0ba00
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 16 deletions.
14 changes: 7 additions & 7 deletions php/ext/google/protobuf/php-upb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16233,7 +16233,7 @@ bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,
}

bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
int depth) {
const upb_DefPool* ext_pool, int depth) {
UPB_ASSERT(!upb_Message_IsFrozen(msg));
size_t iter = kUpb_Message_Begin;
const upb_FieldDef* f;
Expand All @@ -16244,7 +16244,7 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,

_upb_Message_DiscardUnknown_shallow(msg);

while (upb_Message_Next(msg, m, NULL /*ext_pool*/, &f, &val, &iter)) {
while (upb_Message_Next(msg, m, ext_pool, &f, &val, &iter)) {
const upb_MessageDef* subm = upb_FieldDef_MessageSubDef(f);
if (!subm) continue;
if (upb_FieldDef_IsMap(f)) {
Expand All @@ -16258,7 +16258,7 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
upb_MessageValue map_key, map_val;
while (upb_Map_Next(map, &map_key, &map_val, &iter)) {
if (!_upb_Message_DiscardUnknown((upb_Message*)map_val.msg_val, val_m,
depth)) {
ext_pool, depth)) {
ret = false;
}
}
Expand All @@ -16268,13 +16268,13 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
for (i = 0; i < n; i++) {
upb_MessageValue elem = upb_Array_Get(arr, i);
if (!_upb_Message_DiscardUnknown((upb_Message*)elem.msg_val, subm,
depth)) {
ext_pool, depth)) {
ret = false;
}
}
} else {
if (!_upb_Message_DiscardUnknown((upb_Message*)val.msg_val, subm,
depth)) {
ext_pool, depth)) {
ret = false;
}
}
Expand All @@ -16284,8 +16284,8 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
}

bool upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
int maxdepth) {
return _upb_Message_DiscardUnknown(msg, m, maxdepth);
const upb_DefPool* ext_pool, int maxdepth) {
return _upb_Message_DiscardUnknown(msg, m, ext_pool, maxdepth);
}


Expand Down
4 changes: 3 additions & 1 deletion php/ext/google/protobuf/php-upb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13665,7 +13665,9 @@ UPB_API bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,

// Clears all unknown field data from this message and all submessages.
UPB_API bool upb_Message_DiscardUnknown(upb_Message* msg,
const upb_MessageDef* m, int maxdepth);
const upb_MessageDef* m,
const upb_DefPool* ext_pool,
int maxdepth);

#ifdef __cplusplus
} /* extern "C" */
Expand Down
14 changes: 7 additions & 7 deletions ruby/ext/google/protobuf_c/ruby-upb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15720,7 +15720,7 @@ bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,
}

bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
int depth) {
const upb_DefPool* ext_pool, int depth) {
UPB_ASSERT(!upb_Message_IsFrozen(msg));
size_t iter = kUpb_Message_Begin;
const upb_FieldDef* f;
Expand All @@ -15731,7 +15731,7 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,

_upb_Message_DiscardUnknown_shallow(msg);

while (upb_Message_Next(msg, m, NULL /*ext_pool*/, &f, &val, &iter)) {
while (upb_Message_Next(msg, m, ext_pool, &f, &val, &iter)) {
const upb_MessageDef* subm = upb_FieldDef_MessageSubDef(f);
if (!subm) continue;
if (upb_FieldDef_IsMap(f)) {
Expand All @@ -15745,7 +15745,7 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
upb_MessageValue map_key, map_val;
while (upb_Map_Next(map, &map_key, &map_val, &iter)) {
if (!_upb_Message_DiscardUnknown((upb_Message*)map_val.msg_val, val_m,
depth)) {
ext_pool, depth)) {
ret = false;
}
}
Expand All @@ -15755,13 +15755,13 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
for (i = 0; i < n; i++) {
upb_MessageValue elem = upb_Array_Get(arr, i);
if (!_upb_Message_DiscardUnknown((upb_Message*)elem.msg_val, subm,
depth)) {
ext_pool, depth)) {
ret = false;
}
}
} else {
if (!_upb_Message_DiscardUnknown((upb_Message*)val.msg_val, subm,
depth)) {
ext_pool, depth)) {
ret = false;
}
}
Expand All @@ -15771,8 +15771,8 @@ bool _upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
}

bool upb_Message_DiscardUnknown(upb_Message* msg, const upb_MessageDef* m,
int maxdepth) {
return _upb_Message_DiscardUnknown(msg, m, maxdepth);
const upb_DefPool* ext_pool, int maxdepth) {
return _upb_Message_DiscardUnknown(msg, m, ext_pool, maxdepth);
}


Expand Down
4 changes: 3 additions & 1 deletion ruby/ext/google/protobuf_c/ruby-upb.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13667,7 +13667,9 @@ UPB_API bool upb_Message_Next(const upb_Message* msg, const upb_MessageDef* m,

// Clears all unknown field data from this message and all submessages.
UPB_API bool upb_Message_DiscardUnknown(upb_Message* msg,
const upb_MessageDef* m, int maxdepth);
const upb_MessageDef* m,
const upb_DefPool* ext_pool,
int maxdepth);

#ifdef __cplusplus
} /* extern "C" */
Expand Down

0 comments on commit 4d0ba00

Please sign in to comment.