[lld] 5d24341 - [lld] Migrate away from PointerUnion::dyn_cast (NFC) (#124504)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Jan 27 10:34:58 PST 2025
Author: Kazu Hirata
Date: 2025-01-27T10:34:54-08:00
New Revision: 5d2434166787e36312f037538119d3820c5af5e6
URL: https://github.com/llvm/llvm-project/commit/5d2434166787e36312f037538119d3820c5af5e6
DIFF: https://github.com/llvm/llvm-project/commit/5d2434166787e36312f037538119d3820c5af5e6.diff
LOG: [lld] Migrate away from PointerUnion::dyn_cast (NFC) (#124504)
Note that PointerUnion::dyn_cast has been soft deprecated in
PointerUnion.h:
// FIXME: Replace the uses of is(), get() and dyn_cast() with
// isa<T>, cast<T> and the llvm::dyn_cast<T>
This patch migrates uses of PointerUnion::dyn_cast to
dyn_cast_if_present (see the definition of PointerUnion::dyn_cast).
Note that we cannot use dyn_cast in any of the migrations in this
patch; placing
assert(!X.isNull());
just before any of dyn_cast_if_present in this patch triggers some
failure in check-lld.
Added:
Modified:
lld/MachO/ObjC.cpp
lld/MachO/Writer.cpp
Removed:
################################################################################
diff --git a/lld/MachO/ObjC.cpp b/lld/MachO/ObjC.cpp
index 272197b34e1155..fe9cee9651ccab 100644
--- a/lld/MachO/ObjC.cpp
+++ b/lld/MachO/ObjC.cpp
@@ -543,7 +543,7 @@ ObjcCategoryMerger::tryGetSymbolAtIsecOffset(const ConcatInputSection *isec,
if (!reloc)
return nullptr;
- Symbol *sym = reloc->referent.dyn_cast<Symbol *>();
+ Symbol *sym = dyn_cast_if_present<Symbol *>(reloc->referent);
if (reloc->addend && sym) {
assert(isa<Defined>(sym) && "Expected defined for non-zero addend");
diff --git a/lld/MachO/Writer.cpp b/lld/MachO/Writer.cpp
index bec980e18e18b4..d9856a46e8cb86 100644
--- a/lld/MachO/Writer.cpp
+++ b/lld/MachO/Writer.cpp
@@ -711,7 +711,7 @@ void Writer::scanRelocations() {
// Canonicalize the referent so that later accesses in Writer won't
// have to worry about it.
- if (auto *referentIsec = r.referent.dyn_cast<InputSection *>())
+ if (auto *referentIsec = dyn_cast_if_present<InputSection *>(r.referent))
r.referent = referentIsec->canonical();
if (target->hasAttr(r.type, RelocAttrBits::SUBTRAHEND)) {
@@ -725,7 +725,7 @@ void Writer::scanRelocations() {
it->referent = referentIsec->canonical();
continue;
}
- if (auto *sym = r.referent.dyn_cast<Symbol *>()) {
+ if (auto *sym = dyn_cast_if_present<Symbol *>(r.referent)) {
if (auto *undefined = dyn_cast<Undefined>(sym))
treatUndefinedSymbol(*undefined, isec, r.offset);
// treatUndefinedSymbol() can replace sym with a DylibSymbol; re-check.
More information about the llvm-commits
mailing list