Merge branch 'master' into iX-evex-vaes-vpclmulqdq

DynamoRIO · Dec 18, 2024 · b6c158e · b6c158e
2 parents 8319a51 + c0ebcbb
commit b6c158e
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 6 deletions.
diff --git a/api/docs/code_reviews.dox b/api/docs/code_reviews.dox
@@ -198,10 +198,11 @@ appear.  Do not simply reply at the top level, as such comments are more
 difficult to follow as a conversation thread with context.
 
 After making changes in response to review comments, commit those changes
-locally as a new commit on top of your original commit.  If the reviewer
-requested changes to the commit message, use a new proposed final commit
-message as the message for this change commit so that the reviewer can
-review the new message.
+locally as a new commit on top of your original commit (do not squash the
+new changes into the original commit; use separate commits).  If the reviewer
+requested changes to the commit message or title, edit those directly in
+the pull request text boxes as those are what become the final commit
+message.
 
 Project members should then push the new commit to the pull request via:
 
@@ -215,7 +216,10 @@ separate commit (these separate commits will all be squashed together upon mergi
 When the requested changes have been pushed, request a re-review from the reviewer so they know that the pull request is ready for another round of reviewing.
 This can be done by clicking the re-review button next to the reviewer's name at the top of the right sidebar on the pull request page.
 
-The final squash-and-merge step will squash these additional commits with the original to make a single commit that will be fast-forward-merged into master (see below for more details).
+The final squash-and-merge step will squash these additional commits with the
+original to make a single commit that will be fast-forward-merged into master (see
+below for more details).  The final master branch merge commit's title and
+description come directly from the pull request title and description.
 
 # Updating from Master
 

diff --git a/api/docs/release.dox b/api/docs/release.dox
@@ -124,7 +124,17 @@ Dr. Memory Framework (DRMF) in the same package as DynamoRIO.  DRMF
 provides the umbra, drsyscall, and drsymcache Extensions for use by
 clients.
 
-The changes between version \DR_VERSION and 11.0.0 include the following compatibility
+The changes between version \DR_VERSION and 11.1.0 include the following compatibility
+changes:
+ - No compatibility changes yet.
+
+Further non-compatibility-affecting changes include:
+ - No changes yet.
+
+**************************************************
+<hr>
+
+The changes between version 11.1.0 and 11.0.0 include the following compatibility
 changes:
  - Removed uncompleted instructions and the corresponding memrefs from drmemtraces.
    Instructions which are fetched but not completed due to asynchronous signal or

diff --git a/suite/tests/api/it_arm.c b/suite/tests/api/it_arm.c
@@ -99,6 +99,7 @@ test_dr_insert_it_instrs_cbr(void *dcontext)
     DR_ASSERT(instr_get_opcode(instr_it3) == OP_it);
     DR_ASSERT(instr_it_block_get_count(instr_it3) == 3);
     instrlist_encode(dcontext, ilist, buffer, true);
+    instrlist_clear_and_destroy(dcontext, ilist);
 }
 
 void
@@ -168,6 +169,7 @@ test_dr_insert_it_instrs_cti(void *dcontext)
     DR_ASSERT(instr_get_opcode(instr_it3) == OP_it);
     DR_ASSERT(instr_it_block_get_count(instr_it3) == 4);
     instrlist_encode(dcontext, ilist, buffer, true);
+    instrlist_clear_and_destroy(dcontext, ilist);
 }
 
 int