[C++] Fix vtable deduplication for 64-bit buffers >2GB#8591
Merged
jtdavis777 merged 2 commits intogoogle:masterfrom Nov 27, 2025
Merged
[C++] Fix vtable deduplication for 64-bit buffers >2GB#8591jtdavis777 merged 2 commits intogoogle:masterfrom
jtdavis777 merged 2 commits intogoogle:masterfrom
Conversation
Contributor
|
Thanks for the fix. |
jtdavis777
approved these changes
Nov 27, 2025
Collaborator
jtdavis777
left a comment
There was a problem hiding this comment.
LGTM - I didn't fix the formatting properly while fixing a merge conflict, but I think it's fine. a pass of the formatter at a later time will fix it and it doesn't affect readability.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Fixes #8590
Summary
This PR corrects vtable deduplication for FlatBuffers using 64-bit offsets. Previously, when serializing buffers larger than 2GB, vtable deduplication failed, resulting in much slower serialization and larger buffer sizes.
Root Cause
The issue was caused by 64-bit offset calculations not accounting for
length_of_64_bit_region_. As a result, the addresses of vtable candidates stored inscratch_datawere miscalculated, preventing proper deduplication.Solution
This fix includes
length_of_64_bit_region_in the offset calculation for vtables in 64-bit mode. This ensures correct vtable candidate addresses, enabling deduplication and restoring efficient serialization for large buffers.Impact
Verification