diff options
Diffstat (limited to 'contrib/llvm-project/llvm/lib/Transforms/Utils/Evaluator.cpp')
| -rw-r--r-- | contrib/llvm-project/llvm/lib/Transforms/Utils/Evaluator.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/contrib/llvm-project/llvm/lib/Transforms/Utils/Evaluator.cpp b/contrib/llvm-project/llvm/lib/Transforms/Utils/Evaluator.cpp index 463c223d9e8f..9c8aed94708e 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Utils/Evaluator.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Utils/Evaluator.cpp @@ -128,11 +128,6 @@ isSimpleEnoughValueToCommit(Constant *C, /// globals and GEP's of globals. This should be kept up to date with /// CommitValueTo. static bool isSimpleEnoughPointerToCommit(Constant *C, const DataLayout &DL) { - // Conservatively, avoid aggregate types. This is because we don't - // want to worry about them partially overlapping other stores. - if (!cast<PointerType>(C->getType())->getElementType()->isSingleValueType()) - return false; - if (GlobalVariable *GV = dyn_cast<GlobalVariable>(C)) // Do not allow weak/*_odr/linkonce linkage or external globals. return GV->hasUniqueInitializer(); @@ -284,7 +279,7 @@ bool Evaluator::getFormalParams(CallBase &CB, Function *F, return false; auto *FTy = F->getFunctionType(); - if (FTy->getNumParams() > CB.getNumArgOperands()) { + if (FTy->getNumParams() > CB.arg_size()) { LLVM_DEBUG(dbgs() << "Too few arguments for function.\n"); return false; } @@ -343,7 +338,10 @@ bool Evaluator::EvaluateBlock(BasicBlock::iterator CurInst, BasicBlock *&NextBB, Ptr = FoldedPtr; LLVM_DEBUG(dbgs() << "; To: " << *Ptr << "\n"); } - if (!isSimpleEnoughPointerToCommit(Ptr, DL)) { + // Conservatively, avoid aggregate types. This is because we don't + // want to worry about them partially overlapping other stores. + if (!SI->getValueOperand()->getType()->isSingleValueType() || + !isSimpleEnoughPointerToCommit(Ptr, DL)) { // If this is too complex for us to commit, reject it. LLVM_DEBUG( dbgs() << "Pointer is too complex for us to evaluate store."); |