From 2e05045e2601da7f88d93661b24277dd8790a0c8 Mon Sep 17 00:00:00 2001 From: Nick Desaulniers Date: Wed, 5 Jun 2019 01:28:55 +0000 Subject: [PATCH] [TargetTransformInfo] assert on nullptr Summary: This was flagged in https://www.viva64.com/en/b/0629/ under "Snippet No. 38". Add an assertion, since it's unlikely that this parameter is nullptr. Reviewers: RKSimon, fhahn Reviewed By: RKSimon Subscribers: fhahn, llvm-commits, RKSimon, srhines Tags: #llvm Differential Revision: https://reviews.llvm.org/D62229 llvm-svn: 362567 --- .../include/llvm/Analysis/TargetTransformInfoImpl.h | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h b/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h index af250aa..bb290ec 100644 --- a/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h +++ b/llvm/include/llvm/Analysis/TargetTransformInfoImpl.h @@ -681,14 +681,12 @@ public: int getGEPCost(Type *PointeeType, const Value *Ptr, ArrayRef Operands) { - const GlobalValue *BaseGV = nullptr; - if (Ptr != nullptr) { - // TODO: will remove this when pointers have an opaque type. - assert(Ptr->getType()->getScalarType()->getPointerElementType() == - PointeeType && - "explicit pointee type doesn't match operand's pointee type"); - BaseGV = dyn_cast(Ptr->stripPointerCasts()); - } + assert(PointeeType && Ptr && "can't get GEPCost of nullptr"); + // TODO: will remove this when pointers have an opaque type. + assert(Ptr->getType()->getScalarType()->getPointerElementType() == + PointeeType && + "explicit pointee type doesn't match operand's pointee type"); + auto *BaseGV = dyn_cast(Ptr->stripPointerCasts()); bool HasBaseReg = (BaseGV == nullptr); auto PtrSizeBits = DL.getPointerTypeSizeInBits(Ptr->getType()); @@ -731,13 +729,10 @@ public: } } - // Assumes the address space is 0 when Ptr is nullptr. - unsigned AS = - (Ptr == nullptr ? 0 : Ptr->getType()->getPointerAddressSpace()); - if (static_cast(this)->isLegalAddressingMode( TargetType, const_cast(BaseGV), - BaseOffset.sextOrTrunc(64).getSExtValue(), HasBaseReg, Scale, AS)) + BaseOffset.sextOrTrunc(64).getSExtValue(), HasBaseReg, Scale, + Ptr->getType()->getPointerAddressSpace())) return TTI::TCC_Free; return TTI::TCC_Basic; } -- 2.7.4