-
Notifications
You must be signed in to change notification settings - Fork 552
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
i#3962 label cb: Add instr_clear_label_callback() (#4889)
PR #3960 added a call to instr_set_label_callback() to set it to NULL from instr_clone(), but if the callback is non-NULL an assert fires in that case. This only normally happens with emulation labels that turn into traces, which happens to not occur in our very few tests of emulation labels (#3173 covers adding more tests). We fix that by adding instr_clear_label_callback() here and using that from instr_clone(), since these callbacks are a little different from other values and it feels best to not clear them using the set routine. A test is added by putting a loop around a scatter-gather expansion, triggering trace creation. I confirmed that the assert does fire without this fix with the loop in place. Fixes #3962
- Loading branch information
1 parent
b39b85d
commit 7d2d522
Showing
5 changed files
with
131 additions
and
11 deletions.
There are no files selected for viewing
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
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
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
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
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