Skip to content

Conversation

@kazutakahirata
Copy link
Contributor

No description provided.

@llvmbot
Copy link
Member

llvmbot commented Jun 22, 2025

@llvm/pr-subscribers-lld

@llvm/pr-subscribers-lld-elf

Author: Kazu Hirata (kazutakahirata)

Changes

Full diff: https://github.com/llvm/llvm-project/pull/145209.diff

2 Files Affected:

  • (modified) lld/ELF/Arch/AArch64.cpp (+2-3)
  • (modified) lld/ELF/Arch/X86_64.cpp (+2-3)
diff --git a/lld/ELF/Arch/AArch64.cpp b/lld/ELF/Arch/AArch64.cpp
index f00c91b5886f3..1812f2af419d2 100644
--- a/lld/ELF/Arch/AArch64.cpp
+++ b/lld/ELF/Arch/AArch64.cpp
@@ -1003,9 +1003,8 @@ static std::optional<uint64_t> getControlTransferAddend(InputSection &is,
 
 static std::pair<Relocation *, uint64_t>
 getBranchInfoAtTarget(InputSection &is, uint64_t offset) {
-  auto *i =
-      std::partition_point(is.relocations.begin(), is.relocations.end(),
-                           [&](Relocation &r) { return r.offset < offset; });
+  auto *i = llvm::partition_point(
+      is.relocations, [&](Relocation &r) { return r.offset < offset; });
   if (i != is.relocations.end() && i->offset == offset &&
       i->type == R_AARCH64_JUMP26) {
     return {i, i->addend};
diff --git a/lld/ELF/Arch/X86_64.cpp b/lld/ELF/Arch/X86_64.cpp
index b991b6f905b96..163505102d0ec 100644
--- a/lld/ELF/Arch/X86_64.cpp
+++ b/lld/ELF/Arch/X86_64.cpp
@@ -1193,9 +1193,8 @@ static std::pair<Relocation *, uint64_t>
 getBranchInfoAtTarget(InputSection &is, uint64_t offset) {
   auto content = is.contentMaybeDecompress();
   if (content.size() > offset && content[offset] == 0xe9) { // JMP immediate
-    auto *i = std::partition_point(
-        is.relocations.begin(), is.relocations.end(),
-        [&](Relocation &r) { return r.offset < offset + 1; });
+    auto *i = llvm::partition_point(
+        is.relocations, [&](Relocation &r) { return r.offset < offset + 1; });
     // Unlike with getControlTransferAddend() it is valid to accept a PC32
     // relocation here because we know that this is actually a JMP and not some
     // other reference, so the interpretation is that we add 4 to the addend and

@kazutakahirata kazutakahirata merged commit 2ac293f into llvm:main Jun 22, 2025
10 checks passed
@kazutakahirata kazutakahirata deleted the cleanup_20250621_llvm_partition_point_lld branch June 22, 2025 13:30
zmodem added a commit that referenced this pull request Jun 23, 2025
This caused assertion failures in applyBranchToBranchOpt():

  llvm/include/llvm/Support/Casting.h:578:
  decltype(auto) llvm::cast(From*)
  [with To = lld::elf::InputSection; From = lld::elf::InputSectionBase]:
  Assertion `isa<To>(Val) && "cast<Ty>() argument of incompatible type!"' failed.

See comment on the PR (#138366)

This reverts commit 491b82a.

This also reverts the follow-up "[lld] Use llvm::partition_point (NFC) (#145209)"

This reverts commit 2ac293f.
anthonyhatran pushed a commit to anthonyhatran/llvm-project that referenced this pull request Jun 26, 2025
This caused assertion failures in applyBranchToBranchOpt():

  llvm/include/llvm/Support/Casting.h:578:
  decltype(auto) llvm::cast(From*)
  [with To = lld::elf::InputSection; From = lld::elf::InputSectionBase]:
  Assertion `isa<To>(Val) && "cast<Ty>() argument of incompatible type!"' failed.

See comment on the PR (llvm#138366)

This reverts commit 491b82a.

This also reverts the follow-up "[lld] Use llvm::partition_point (NFC) (llvm#145209)"

This reverts commit 2ac293f.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants