From ac53a5f1dc21916f1072031703e0e1833e963454 Mon Sep 17 00:00:00 2001 From: Matt Arsenault Date: Thu, 9 Jan 2020 11:03:17 -0500 Subject: [PATCH] GlobalISel: Fix else after return --- llvm/lib/CodeGen/LowLevelType.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/llvm/lib/CodeGen/LowLevelType.cpp b/llvm/lib/CodeGen/LowLevelType.cpp index d4baf56..40dfa69 100644 --- a/llvm/lib/CodeGen/LowLevelType.cpp +++ b/llvm/lib/CodeGen/LowLevelType.cpp @@ -24,15 +24,21 @@ LLT llvm::getLLTForType(Type &Ty, const DataLayout &DL) { if (NumElements == 1) return ScalarTy; return LLT::vector(NumElements, ScalarTy); - } else if (auto PTy = dyn_cast(&Ty)) { - return LLT::pointer(PTy->getAddressSpace(), DL.getTypeSizeInBits(&Ty)); - } else if (Ty.isSized()) { + } + + if (auto PTy = dyn_cast(&Ty)) { + unsigned AddrSpace = PTy->getAddressSpace(); + return LLT::pointer(AddrSpace, DL.getPointerSizeInBits(AddrSpace)); + } + + if (Ty.isSized()) { // Aggregates are no different from real scalars as far as GlobalISel is // concerned. auto SizeInBits = DL.getTypeSizeInBits(&Ty); assert(SizeInBits != 0 && "invalid zero-sized type"); return LLT::scalar(SizeInBits); } + return LLT(); } -- 2.7.4