[llvm] [DebugInfo] Preserve line and column number when merging debug info. (PR #129960)

[via llvm-commits]

github-actions[bot] wrote:

<!--LLVM CODE FORMAT COMMENT: {clang-format}-->


:warning: C/C++ code formatter, clang-format found issues in your code. :warning:

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

``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions cpp -- llvm/lib/IR/DebugInfoMetadata.cpp
``````````

</details>

<details>
<summary>
View the diff from clang-format here.
</summary>

``````````diff
diff --git a/llvm/lib/IR/DebugInfoMetadata.cpp b/llvm/lib/IR/DebugInfoMetadata.cpp
index bac508e52..12aba7d2b 100644
--- a/llvm/lib/IR/DebugInfoMetadata.cpp
+++ b/llvm/lib/IR/DebugInfoMetadata.cpp
@@ -138,12 +138,10 @@ DILocation *DILocation::getMergedLocation(DILocation *LocA, DILocation *LocB) {
   // not useful for PGO.
   if (PickMergedSourceLocations) {
     auto A = std::make_tuple(LocA->getLine(), LocA->getColumn(),
-                             LocA->getDiscriminator(),
-                             LocA->getFilename(),
+                             LocA->getDiscriminator(), LocA->getFilename(),
                              LocA->getDirectory());
     auto B = std::make_tuple(LocB->getLine(), LocB->getColumn(),
-                             LocB->getDiscriminator(),
-                             LocB->getFilename(),
+                             LocB->getDiscriminator(), LocB->getFilename(),
                              LocB->getDirectory());
     return A < B ? LocA : LocB;
   }

``````````

</details>


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