diff --git a/llvm/lib/Analysis/DomTreeUpdater.cpp b/llvm/lib/Analysis/DomTreeUpdater.cpp --- a/llvm/lib/Analysis/DomTreeUpdater.cpp +++ b/llvm/lib/Analysis/DomTreeUpdater.cpp @@ -106,8 +106,7 @@ // validateDeleteBB() removes all instructions of DelBB and adds an // UnreachableInst as its terminator. So we check whether the BasicBlock to // delete only has an UnreachableInst inside. - assert(BB->getInstList().size() == 1 && - isa(BB->getTerminator()) && + assert(BB->size() == 1 && isa(BB->getTerminator()) && "DelBB has been modified while awaiting deletion."); BB->removeFromParent(); eraseDelBBNode(BB); diff --git a/llvm/lib/Analysis/LoopNestAnalysis.cpp b/llvm/lib/Analysis/LoopNestAnalysis.cpp --- a/llvm/lib/Analysis/LoopNestAnalysis.cpp +++ b/llvm/lib/Analysis/LoopNestAnalysis.cpp @@ -295,7 +295,7 @@ return *From; auto IsEmpty = [](const BasicBlock *BB) { - return (BB->getInstList().size() == 1); + return (BB->size() == 1); }; // Visited is used to avoid running into an infinite loop. @@ -379,7 +379,7 @@ // Ensure the inner loop guard successor is empty before skipping // blocks. - if (Succ->getInstList().size() == 1) { + if (Succ->size() == 1) { PotentialInnerPreHeader = &LoopNest::skipEmptyBlockUntil(Succ, InnerLoopPreHeader); PotentialOuterLatch = diff --git a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp --- a/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp +++ b/llvm/lib/Transforms/Utils/BasicBlockUtils.cpp @@ -85,7 +85,7 @@ BB->getInstList().pop_back(); } new UnreachableInst(BB->getContext(), BB); - assert(BB->getInstList().size() == 1 && + assert(BB->size() == 1 && isa(BB->getTerminator()) && "The successor list of BB isn't empty before " "applying corresponding DTU updates.");