[llvm] ddb85f3 - [ObjCARC] Fix non-determinism
Kyungwoo Lee via llvm-commits
llvm-commits at lists.llvm.org
Thu Mar 17 15:01:31 PDT 2022
Author: Kyungwoo Lee
Date: 2022-03-17T15:01:09-07:00
New Revision: ddb85f34f534ed74312ef91e4c1f8792ad8f08f0
URL: https://github.com/llvm/llvm-project/commit/ddb85f34f534ed74312ef91e4c1f8792ad8f08f0
DIFF: https://github.com/llvm/llvm-project/commit/ddb85f34f534ed74312ef91e4c1f8792ad8f08f0.diff
LOG: [ObjCARC] Fix non-determinism
We often failed in the assertion, non-deterministically with a large IR:
```
Assertion `notDifferentParent(LocA.Ptr, LocB.Ptr) && "BasicAliasAnalysis doesn't support interprocedural queries."
```
Looking at the comment in https://reviews.llvm.org/D87806, it appears it's actually a module pass for new PM while the legacy PM still works as a function pass.
The fix is to align the same behavior in between new PM and old PM, which initializes ObjCARCContract for each function.
Reviewed By: aeubanks
Differential Revision: https://reviews.llvm.org/D121949
Added:
Modified:
llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp
Removed:
################################################################################
diff --git a/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp b/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp
index 2985ae004d3cc..f64c26ef2bed6 100644
--- a/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp
+++ b/llvm/lib/Transforms/ObjCARC/ObjCARCContract.cpp
@@ -102,11 +102,8 @@ class ObjCARCContract {
};
class ObjCARCContractLegacyPass : public FunctionPass {
- ObjCARCContract OCARCC;
-
public:
void getAnalysisUsage(AnalysisUsage &AU) const override;
- bool doInitialization(Module &M) override;
bool runOnFunction(Function &F) override;
static char ID;
@@ -737,11 +734,9 @@ Pass *llvm::createObjCARCContractPass() {
return new ObjCARCContractLegacyPass();
}
-bool ObjCARCContractLegacyPass::doInitialization(Module &M) {
- return OCARCC.init(M);
-}
-
bool ObjCARCContractLegacyPass::runOnFunction(Function &F) {
+ ObjCARCContract OCARCC;
+ OCARCC.init(*F.getParent());
auto *AA = &getAnalysis<AAResultsWrapperPass>().getAAResults();
auto *DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
return OCARCC.run(F, AA, DT);
More information about the llvm-commits
mailing list