[llvm] Migrate away from PointerUnion::{is,get,dyn_cast} (NFC) #115681
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Note that PointerUnion::{is,get,dyn_cast} have 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>
|
@llvm/pr-subscribers-tablegen @llvm/pr-subscribers-llvm-globalisel Author: Kazu Hirata (kazutakahirata) ChangesNote that PointerUnion::{is,get,dyn_cast} have been soft deprecated in // FIXME: Replace the uses of is(), get() and dyn_cast() with Full diff: https://github.com/llvm/llvm-project/pull/115681.diff 2 Files Affected:
diff --git a/llvm/include/llvm/IR/DebugProgramInstruction.h b/llvm/include/llvm/IR/DebugProgramInstruction.h
index a6605052ba83d3..e979d8840cbaf8 100644
--- a/llvm/include/llvm/IR/DebugProgramInstruction.h
+++ b/llvm/include/llvm/IR/DebugProgramInstruction.h
@@ -371,29 +371,29 @@ class DbgVariableRecord : public DbgRecord, protected DebugValueUser {
return I == RHS.I;
}
const Value *operator*() const {
- ValueAsMetadata *VAM = I.is<ValueAsMetadata *>()
- ? I.get<ValueAsMetadata *>()
- : *I.get<ValueAsMetadata **>();
+ ValueAsMetadata *VAM = isa<ValueAsMetadata *>(I)
+ ? cast<ValueAsMetadata *>(I)
+ : *cast<ValueAsMetadata **>(I);
return VAM->getValue();
};
Value *operator*() {
- ValueAsMetadata *VAM = I.is<ValueAsMetadata *>()
- ? I.get<ValueAsMetadata *>()
- : *I.get<ValueAsMetadata **>();
+ ValueAsMetadata *VAM = isa<ValueAsMetadata *>(I)
+ ? cast<ValueAsMetadata *>(I)
+ : *cast<ValueAsMetadata **>(I);
return VAM->getValue();
}
location_op_iterator &operator++() {
- if (I.is<ValueAsMetadata *>())
- I = I.get<ValueAsMetadata *>() + 1;
+ if (auto *VAM = dyn_cast<ValueAsMetadata *>(I))
+ I = VAM + 1;
else
- I = I.get<ValueAsMetadata **>() + 1;
+ I = cast<ValueAsMetadata **>(I) + 1;
return *this;
}
location_op_iterator &operator--() {
- if (I.is<ValueAsMetadata *>())
- I = I.get<ValueAsMetadata *>() - 1;
+ if (auto *VAM = dyn_cast<ValueAsMetadata *>(I))
+ I = VAM - 1;
else
- I = I.get<ValueAsMetadata **>() - 1;
+ I = cast<ValueAsMetadata **>(I) - 1;
return *this;
}
};
diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp
index 895743ad8230c8..a3344718cb3626 100644
--- a/llvm/utils/TableGen/GlobalISelEmitter.cpp
+++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp
@@ -2118,9 +2118,9 @@ Expected<RuleMatcher> GlobalISelEmitter::runOnPattern(const PatternToMatch &P) {
return failedImport(
"Cannot infer register class for SUBREG_TO_REG operand #0");
MatchedRC = *MaybeRegClass;
- } else if (MatchedRC.get<const Record *>()->isSubClassOf("RegisterOperand"))
- MatchedRC = MatchedRC.get<const Record *>()->getValueAsDef("RegClass");
- else if (!MatchedRC.get<const Record *>()->isSubClassOf("RegisterClass"))
+ } else if (cast<const Record *>(MatchedRC)->isSubClassOf("RegisterOperand"))
+ MatchedRC = cast<const Record *>(MatchedRC)->getValueAsDef("RegClass");
+ else if (!cast<const Record *>(MatchedRC)->isSubClassOf("RegisterClass"))
return failedImport("Dst MI def isn't a register class" + to_string(Dst));
OperandMatcher &OM = InsnMatcher.getOperand(OpIdx);
@@ -2130,10 +2130,10 @@ Expected<RuleMatcher> GlobalISelEmitter::runOnPattern(const PatternToMatch &P) {
// GIM_CheckIsSameOperand predicates by the defineOperand method.
OM.setSymbolicName(getMangledRootDefName(DstIOperand.Name));
M.defineOperand(OM.getSymbolicName(), OM);
- if (MatchedRC.is<const Record *>())
- MatchedRC = &Target.getRegisterClass(MatchedRC.get<const Record *>());
+ if (auto *R = dyn_cast<const Record *>(MatchedRC))
+ MatchedRC = &Target.getRegisterClass(R);
OM.addPredicate<RegisterBankOperandMatcher>(
- *MatchedRC.get<const CodeGenRegisterClass *>());
+ *cast<const CodeGenRegisterClass *>(MatchedRC));
++OpIdx;
}
|
|
@llvm/pr-subscribers-llvm-ir Author: Kazu Hirata (kazutakahirata) ChangesNote that PointerUnion::{is,get,dyn_cast} have been soft deprecated in // FIXME: Replace the uses of is(), get() and dyn_cast() with Full diff: https://github.com/llvm/llvm-project/pull/115681.diff 2 Files Affected:
diff --git a/llvm/include/llvm/IR/DebugProgramInstruction.h b/llvm/include/llvm/IR/DebugProgramInstruction.h
index a6605052ba83d3..e979d8840cbaf8 100644
--- a/llvm/include/llvm/IR/DebugProgramInstruction.h
+++ b/llvm/include/llvm/IR/DebugProgramInstruction.h
@@ -371,29 +371,29 @@ class DbgVariableRecord : public DbgRecord, protected DebugValueUser {
return I == RHS.I;
}
const Value *operator*() const {
- ValueAsMetadata *VAM = I.is<ValueAsMetadata *>()
- ? I.get<ValueAsMetadata *>()
- : *I.get<ValueAsMetadata **>();
+ ValueAsMetadata *VAM = isa<ValueAsMetadata *>(I)
+ ? cast<ValueAsMetadata *>(I)
+ : *cast<ValueAsMetadata **>(I);
return VAM->getValue();
};
Value *operator*() {
- ValueAsMetadata *VAM = I.is<ValueAsMetadata *>()
- ? I.get<ValueAsMetadata *>()
- : *I.get<ValueAsMetadata **>();
+ ValueAsMetadata *VAM = isa<ValueAsMetadata *>(I)
+ ? cast<ValueAsMetadata *>(I)
+ : *cast<ValueAsMetadata **>(I);
return VAM->getValue();
}
location_op_iterator &operator++() {
- if (I.is<ValueAsMetadata *>())
- I = I.get<ValueAsMetadata *>() + 1;
+ if (auto *VAM = dyn_cast<ValueAsMetadata *>(I))
+ I = VAM + 1;
else
- I = I.get<ValueAsMetadata **>() + 1;
+ I = cast<ValueAsMetadata **>(I) + 1;
return *this;
}
location_op_iterator &operator--() {
- if (I.is<ValueAsMetadata *>())
- I = I.get<ValueAsMetadata *>() - 1;
+ if (auto *VAM = dyn_cast<ValueAsMetadata *>(I))
+ I = VAM - 1;
else
- I = I.get<ValueAsMetadata **>() - 1;
+ I = cast<ValueAsMetadata **>(I) - 1;
return *this;
}
};
diff --git a/llvm/utils/TableGen/GlobalISelEmitter.cpp b/llvm/utils/TableGen/GlobalISelEmitter.cpp
index 895743ad8230c8..a3344718cb3626 100644
--- a/llvm/utils/TableGen/GlobalISelEmitter.cpp
+++ b/llvm/utils/TableGen/GlobalISelEmitter.cpp
@@ -2118,9 +2118,9 @@ Expected<RuleMatcher> GlobalISelEmitter::runOnPattern(const PatternToMatch &P) {
return failedImport(
"Cannot infer register class for SUBREG_TO_REG operand #0");
MatchedRC = *MaybeRegClass;
- } else if (MatchedRC.get<const Record *>()->isSubClassOf("RegisterOperand"))
- MatchedRC = MatchedRC.get<const Record *>()->getValueAsDef("RegClass");
- else if (!MatchedRC.get<const Record *>()->isSubClassOf("RegisterClass"))
+ } else if (cast<const Record *>(MatchedRC)->isSubClassOf("RegisterOperand"))
+ MatchedRC = cast<const Record *>(MatchedRC)->getValueAsDef("RegClass");
+ else if (!cast<const Record *>(MatchedRC)->isSubClassOf("RegisterClass"))
return failedImport("Dst MI def isn't a register class" + to_string(Dst));
OperandMatcher &OM = InsnMatcher.getOperand(OpIdx);
@@ -2130,10 +2130,10 @@ Expected<RuleMatcher> GlobalISelEmitter::runOnPattern(const PatternToMatch &P) {
// GIM_CheckIsSameOperand predicates by the defineOperand method.
OM.setSymbolicName(getMangledRootDefName(DstIOperand.Name));
M.defineOperand(OM.getSymbolicName(), OM);
- if (MatchedRC.is<const Record *>())
- MatchedRC = &Target.getRegisterClass(MatchedRC.get<const Record *>());
+ if (auto *R = dyn_cast<const Record *>(MatchedRC))
+ MatchedRC = &Target.getRegisterClass(R);
OM.addPredicate<RegisterBankOperandMatcher>(
- *MatchedRC.get<const CodeGenRegisterClass *>());
+ *cast<const CodeGenRegisterClass *>(MatchedRC));
++OpIdx;
}
|
kuhar
approved these changes
Nov 11, 2024
Groverkss
pushed a commit
to iree-org/llvm-project
that referenced
this pull request
Nov 15, 2024
…115681) Note that PointerUnion::{is,get,dyn_cast} have 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>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Note that PointerUnion::{is,get,dyn_cast} have been soft deprecated in
PointerUnion.h:
// FIXME: Replace the uses of is(), get() and dyn_cast() with
// isa, cast and the llvm::dyn_cast