[llvm] [IR] Reduce use of getCalledFunction in Verifier. NFCI. (PR #134978)
Jay Foad via llvm-commits
llvm-commits at lists.llvm.org
Wed Apr 9 03:20:28 PDT 2025
https://github.com/jayfoad updated https://github.com/llvm/llvm-project/pull/134978
>From d0e359c22a2ca2a124fcb603ba22536710040cd6 Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.foad at amd.com>
Date: Wed, 9 Apr 2025 09:17:32 +0100
Subject: [PATCH 1/3] [IR] Reduce use of getCalledFunction in Verifier. NFCI.
This is mostly just a simplification. getCalledFunction is a best-effort
thing so the verifier should not be relying on it in most cases, except
for intrinsic calls where we are guaranteed that the called function is
known, but most of those cases can be handled with
CallBase::getIntrinsicID instead.
---
llvm/lib/IR/Verifier.cpp | 40 +++++++++++++++-------------------------
1 file changed, 15 insertions(+), 25 deletions(-)
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index 7423e746dfa9a..fa3a1c59e3e7c 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -2629,9 +2629,7 @@ void Verifier::verifyInlineAsmCall(const CallBase &Call) {
/// Verify that statepoint intrinsic is well formed.
void Verifier::verifyStatepoint(const CallBase &Call) {
- assert(Call.getCalledFunction() &&
- Call.getCalledFunction()->getIntrinsicID() ==
- Intrinsic::experimental_gc_statepoint);
+ assert(Call.getIntrinsicID() == Intrinsic::experimental_gc_statepoint);
Check(!Call.doesNotAccessMemory() && !Call.onlyReadsMemory() &&
!Call.onlyAccessesArgMemory(),
@@ -3635,8 +3633,7 @@ void Verifier::visitCallBase(CallBase &Call) {
}
if (Attrs.hasFnAttr(Attribute::Preallocated)) {
- Check(Call.getCalledFunction()->getIntrinsicID() ==
- Intrinsic::call_preallocated_arg,
+ Check(Call.getIntrinsicID() == Intrinsic::call_preallocated_arg,
"preallocated as a call site attribute can only be on "
"llvm.call.preallocated.arg");
}
@@ -3734,9 +3731,7 @@ void Verifier::visitCallBase(CallBase &Call) {
// Statepoint intrinsic is vararg but the wrapped function may be not.
// Allow sret here and check the wrapped function in verifyStatepoint.
- if (!Call.getCalledFunction() ||
- Call.getCalledFunction()->getIntrinsicID() !=
- Intrinsic::experimental_gc_statepoint)
+ if (Call.getIntrinsicID() != Intrinsic::experimental_gc_statepoint)
Check(!ArgAttrs.hasAttribute(Attribute::StructRet),
"Attribute 'sret' cannot be used for vararg call arguments!",
Call);
@@ -3765,9 +3760,8 @@ void Verifier::visitCallBase(CallBase &Call) {
"Return type cannot be x86_amx for indirect call!");
}
- if (Function *F = Call.getCalledFunction())
- if (Intrinsic::ID ID = (Intrinsic::ID)F->getIntrinsicID())
- visitIntrinsicCall(ID, Call);
+ if (Intrinsic::ID ID = Call.getIntrinsicID())
+ visitIntrinsicCall(ID, Call);
// Verify that a callsite has at most one "deopt", at most one "funclet", at
// most one "gc-transition", at most one "cfguardtarget", at most one
@@ -3980,7 +3974,7 @@ void Verifier::verifyMustTailCall(CallInst &CI) {
// - The caller and callee prototypes must match. Pointer types of
// parameters or return types may differ in pointee type, but not
// address space.
- if (!CI.getCalledFunction() || !CI.getCalledFunction()->isIntrinsic()) {
+ if (!CI.getIntrinsicID()) {
Check(CallerTy->getNumParams() == CalleeTy->getNumParams(),
"cannot guarantee tail call due to mismatched parameter counts", &CI);
for (unsigned I = 0, E = CallerTy->getNumParams(); I != E; ++I) {
@@ -5647,8 +5641,8 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) {
auto *UseCall = dyn_cast<CallBase>(U);
Check(UseCall != nullptr,
"Uses of llvm.call.preallocated.setup must be calls");
- const Function *Fn = UseCall->getCalledFunction();
- if (Fn && Fn->getIntrinsicID() == Intrinsic::call_preallocated_arg) {
+ Intrinsic::ID IID = UseCall->getIntrinsicID();
+ if (IID == Intrinsic::call_preallocated_arg) {
auto *AllocArgIndex = dyn_cast<ConstantInt>(UseCall->getArgOperand(1));
Check(AllocArgIndex != nullptr,
"llvm.call.preallocated.alloc arg index must be a constant");
@@ -5658,8 +5652,7 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) {
"llvm.call.preallocated.alloc arg index must be between 0 and "
"corresponding "
"llvm.call.preallocated.setup's argument count");
- } else if (Fn && Fn->getIntrinsicID() ==
- Intrinsic::call_preallocated_teardown) {
+ } else if (IID == Intrinsic::call_preallocated_teardown) {
// nothing to do
} else {
Check(!FoundCall, "Can have at most one call corresponding to a "
@@ -5700,8 +5693,8 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) {
}
case Intrinsic::call_preallocated_arg: {
auto *Token = dyn_cast<CallBase>(Call.getArgOperand(0));
- Check(Token && Token->getCalledFunction()->getIntrinsicID() ==
- Intrinsic::call_preallocated_setup,
+ Check(Token &&
+ Token->getIntrinsicID() == Intrinsic::call_preallocated_setup,
"llvm.call.preallocated.arg token argument must be a "
"llvm.call.preallocated.setup");
Check(Call.hasFnAttr(Attribute::Preallocated),
@@ -5711,8 +5704,8 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) {
}
case Intrinsic::call_preallocated_teardown: {
auto *Token = dyn_cast<CallBase>(Call.getArgOperand(0));
- Check(Token && Token->getCalledFunction()->getIntrinsicID() ==
- Intrinsic::call_preallocated_setup,
+ Check(Token &&
+ Token->getIntrinsicID() == Intrinsic::call_preallocated_setup,
"llvm.call.preallocated.teardown token argument must be a "
"llvm.call.preallocated.setup");
break;
@@ -5804,11 +5797,8 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) {
// Are we tied to a statepoint properly?
const auto *StatepointCall = dyn_cast<CallBase>(Statepoint);
- const Function *StatepointFn =
- StatepointCall ? StatepointCall->getCalledFunction() : nullptr;
- Check(StatepointFn && StatepointFn->isDeclaration() &&
- StatepointFn->getIntrinsicID() ==
- Intrinsic::experimental_gc_statepoint,
+ Check(StatepointCall->getIntrinsicID() ==
+ Intrinsic::experimental_gc_statepoint,
"gc.result operand #1 must be from a statepoint", Call,
Call.getArgOperand(0));
>From 9e776349f2a77889c4c2e1a5031d6073c4d7f13b Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.foad at gmail.com>
Date: Wed, 9 Apr 2025 11:12:37 +0100
Subject: [PATCH 2/3] Update llvm/lib/IR/Verifier.cpp
Co-authored-by: Tim Gymnich <tim at gymni.ch>
---
llvm/lib/IR/Verifier.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index fa3a1c59e3e7c..978dbd2f08ebb 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -5797,7 +5797,7 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) {
// Are we tied to a statepoint properly?
const auto *StatepointCall = dyn_cast<CallBase>(Statepoint);
- Check(StatepointCall->getIntrinsicID() ==
+ Check(StatepointCall && StatepointCall->getIntrinsicID() ==
Intrinsic::experimental_gc_statepoint,
"gc.result operand #1 must be from a statepoint", Call,
Call.getArgOperand(0));
>From 5f83618e678596cb20835d4c4c565fa65fbb5be9 Mon Sep 17 00:00:00 2001
From: Jay Foad <jay.foad at amd.com>
Date: Wed, 9 Apr 2025 11:20:10 +0100
Subject: [PATCH 3/3] clang-format
---
llvm/lib/IR/Verifier.cpp | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/llvm/lib/IR/Verifier.cpp b/llvm/lib/IR/Verifier.cpp
index 978dbd2f08ebb..8778360b7d434 100644
--- a/llvm/lib/IR/Verifier.cpp
+++ b/llvm/lib/IR/Verifier.cpp
@@ -5798,7 +5798,7 @@ void Verifier::visitIntrinsicCall(Intrinsic::ID ID, CallBase &Call) {
// Are we tied to a statepoint properly?
const auto *StatepointCall = dyn_cast<CallBase>(Statepoint);
Check(StatepointCall && StatepointCall->getIntrinsicID() ==
- Intrinsic::experimental_gc_statepoint,
+ Intrinsic::experimental_gc_statepoint,
"gc.result operand #1 must be from a statepoint", Call,
Call.getArgOperand(0));
More information about the llvm-commits
mailing list