Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

i#6303: Avoid duplicate encoding entry on chunk-split branch pair #6315

Merged
merged 5 commits into from
Sep 21, 2023

Conversation

derekbruening
Copy link
Contributor

Fixes a case where a branch followed by an indirect branch with a chunk split in the middle results in an extra encoding entry after the indirect branch target marker. This extra entry is accumulated in the reader and results in a fatal error.

Adds a unit test. Confirmed the fix on the
drcacheoff.invariant_checker test as well where it was failing reliably on one machine.

Fixes #6303

Fixes a case where a branch followed by an indirect branch with a
chunk split in the middle results in an extra encoding entry after the
indirect branch target marker.  This extra entry is accumulated in the
reader and results in a fatal error.

Adds a unit test.  Confirmed the fix on the
drcacheoff.invariant_checker test as well where it was failing
reliably on one machine.

Fixes #6303
clients/drcachesim/tests/raw2trace_unit_tests.cpp Outdated Show resolved Hide resolved
clients/drcachesim/tracer/raw2trace.cpp Show resolved Hide resolved
clients/drcachesim/tracer/raw2trace.cpp Outdated Show resolved Hide resolved
clients/drcachesim/tracer/raw2trace.cpp Show resolved Hide resolved
…oid a duplicate encoding on the next dynamic instance post-chunk; also apply review requestson name changes and comment updates
@derekbruening derekbruening merged commit 1006071 into master Sep 21, 2023
15 checks passed
@derekbruening derekbruening deleted the i6303-encode-size branch September 21, 2023 23:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Tests failing with "Encoding size 2 != instr size 1": drcacheoff.invariant_checker, drcachesim.opcode_mix
2 participants