Fixes reading of macro table appends. #979
Merged
Conversation
This file contains 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
tgregg
commented
Oct 21, 2024
| @@ -2417,6 +2417,7 @@ private boolean slowReadHeader(final int typeIdByte, final boolean isAnnotated, | |||
| } | |||
| if (minorVersion == 1) { | |||
| if (valueTid.isMacroInvocation) { | |||
| setCheckpointAfterValueHeader(); | |||
There was a problem hiding this comment.
Without this, the reader will in certain cases attempt to read the same byte repetitively, not making any forward progress.
| ) { | ||
| class EncodingContext(macroTable: Map<MacroRef, Macro>) { | ||
|
|
||
| val macroTable = macroTable.toMutableMap() |
There was a problem hiding this comment.
This performs a copy, allowing the caller to mutate the map passed in as an argument without modifying the underlying encoding context. This map is mutable because users may add new macros to the table.
jobarr-amzn
approved these changes
Oct 21, 2024
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.
Issue #, if available:
Fixes #978
By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.