diff options
| -rw-r--r-- | llvm/lib/Transforms/IPO/FunctionAttrs.cpp | 7 | ||||
| -rw-r--r-- | llvm/test/Transforms/FunctionAttrs/norecurse.ll | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp index 360a37f..769cad6 100644 --- a/llvm/lib/Transforms/IPO/FunctionAttrs.cpp +++ b/llvm/lib/Transforms/IPO/FunctionAttrs.cpp @@ -2014,12 +2014,13 @@ static bool addNoRecurseAttrsTopDown(Function &F) { // this function could be recursively (indirectly) called. Note that this // also detects if F is directly recursive as F is not yet marked as // a norecurse function. - for (auto *U : F.users()) { - auto *I = dyn_cast<Instruction>(U); + for (auto &U : F.uses()) { + auto *I = dyn_cast<Instruction>(U.getUser()); if (!I) return false; CallBase *CB = dyn_cast<CallBase>(I); - if (!CB || !CB->getParent()->getParent()->doesNotRecurse()) + if (!CB || !CB->isCallee(&U) || + !CB->getParent()->getParent()->doesNotRecurse()) return false; } F.setDoesNotRecurse(); diff --git a/llvm/test/Transforms/FunctionAttrs/norecurse.ll b/llvm/test/Transforms/FunctionAttrs/norecurse.ll index b1130b9..7baa703 100644 --- a/llvm/test/Transforms/FunctionAttrs/norecurse.ll +++ b/llvm/test/Transforms/FunctionAttrs/norecurse.ll @@ -99,7 +99,9 @@ define void @p() norecurse { } ; CHECK: Function Attrs -; CHECK-SAME: norecurse nosync readnone +; CHECK-NOT: norecurse +; CHECK-SAME: nosync readnone +; CHECK-NOT: norecurse ; CHECK-NEXT: define internal i32 @escapes_as_parameter define internal i32 @escapes_as_parameter(ptr %p) { %a = call i32 @k() |