[llvm-branch-commits] [llvm] llvm-cov: Introduce `--merge-instantiations=<MergeStrategy>` (PR #121194)

[via llvm-branch-commits]

github-actions[bot] wrote:

<!--LLVM IDS CHECK COMMENT-->


:warning: LLVM ABI annotation checker, ids-check found issues in your code. :warning:

<details>
<summary>
You can test this locally with the following command:
</summary>

``````````bash
git diff origin/main HEAD -- 'llvm/include/llvm/**/*.h' 'llvm/include/llvm-c/**/*.h' 'llvm/include/llvm/Demangle/**/*.h'
Then run idt on the changed files with appropriate --export-macro and --include-header flags.
``````````

:warning:
The reproduction instructions above might return results for more than one PR
in a stack if you are using a stacked PR workflow. You can limit the results by
changing `origin/main` to the base branch/commit you want to compare against.
:warning:

</details>

<details>
<summary>
View the diff from ids-check here.
</summary>

``````````diff
diff --git a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
index a50f07cb6..4ef578397 100644
--- a/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
+++ b/llvm/include/llvm/ProfileData/Coverage/CoverageMapping.h
@@ -398,7 +398,7 @@ struct CountedRegion : public CounterMappingRegion {
     return (this->viewLoc() == RHS.viewLoc());
   }
 
-  void merge(const CountedRegion &RHS, MergeStrategy Strategy);
+  LLVM_ABI void merge(const CountedRegion &RHS, MergeStrategy Strategy);
 
   /// Returns comparable rank value in selecting a better Record for merging.
   auto getMergeRank(MergeStrategy Strategy) const {
@@ -513,7 +513,7 @@ public:
 
   // This may invalidate IndependencePairs
   // MCDCRecord &operator+=(const MCDCRecord &RHS);
-  void merge(MCDCRecord &&RHS, MergeStrategy Strategy);
+  LLVM_ABI void merge(MCDCRecord &&RHS, MergeStrategy Strategy);
 
   void commit() { findIndependencePairs(); }
 

``````````

</details>


https://github.com/llvm/llvm-project/pull/121194