Fix Any hasbit consistency issue in OSS.
#24400
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
`Any` `value` field is a `bytes` field in OSS, and since cl/792909628 (#22956), `_internal_mutable_*()` accessors for string fields don't set hasbits. This can cause the hasbit to be missing for the `value` field of `Any` after calling `PackFrom`, which will serialize incorrectly. This change also includes fixes to `any_test`, which failed to catch this bug. We got unlucky, and every test which checked a roundtrip `PackFrom` -> `UnpackTo` for an `Any` field reused the same `Any` object, calling `MessageLite::ParseFromString` (which `Clear()`s it) on the same object. However, `Clear()` skips string fields whose hasbits are not set. This meant the `string value` field of the `Any` was not cleared, since its hasbit had not been properly set by `PackFrom`. So even though the `Any` value skipped serializing its value, the reused `Any` object still contained the expected `string value` serialization of the submessage, and `UnpackTo` worked correctly. The culprit change was adopted in release 33.0, so it will need to be patched to this version. See #24258. Fixes #24258 PiperOrigin-RevId: 828299368
mkruskal-google
approved these changes
Nov 12, 2025
This build has become a severe bottleneck in our CI. To avoid this in the future, always use whatever pre-install version is on the mac runners. The linux tests will cover specific versions of PHP still. PiperOrigin-RevId: 818864695
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Anyvaluefield is abytesfield in OSS, and since cl/792909628 (#22956),_internal_mutable_*()accessors for string fields don't set hasbits. This can cause the hasbit to be missing for thevaluefield ofAnyafter callingPackFrom, which will serialize incorrectly.This change also includes fixes to
any_test, which failed to catch this bug. We got unlucky, and every test which checked a roundtripPackFrom->UnpackTofor anAnyfield reused the sameAnyobject, callingMessageLite::ParseFromString(whichClear()s it) on the same object. However,Clear()skips string fields whose hasbits are not set. This meant thestring valuefield of theAnywas not cleared, since its hasbit had not been properly set byPackFrom. So even though theAnyvalue skipped serializing its value, the reusedAnyobject still contained the expectedstring valueserialization of the submessage, andUnpackToworked correctly.The culprit change was adopted in release 33.0, so it will need to be patched to this version.
See #24258.
Fixes #24258
PiperOrigin-RevId: 828299368
Cherry-pick of 407323f