From f519b999a62996b91923d5aa3d71fba86291b4f3 Mon Sep 17 00:00:00 2001 From: "Vikram S. Adve" Date: Sat, 24 Aug 2002 14:44:58 +0000 Subject: [PATCH] Fix sign-extension: it needs to happen *after* multiplying by type size. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3497 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/TargetData.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/lib/Target/TargetData.cpp b/lib/Target/TargetData.cpp index 6786af3982d..7c55f6730ed 100644 --- a/lib/Target/TargetData.cpp +++ b/lib/Target/TargetData.cpp @@ -164,12 +164,10 @@ uint64_t TargetData::getIndexedOffset(const Type *ptrTy, // Get the array index and the size of each array element. // Both must be known constants, or this will fail. - // Also, the arrayIdx needs to be sign-extended from 32 bits to uint64_t - // since uint is not normally sign-extended when cast to uint64_t. + // Also, the product needs to be sign-extended from 32 to 64 bits. uint64_t elementSize = this->getTypeSize(Ty); uint64_t arrayIdx = cast(Idx[CurIDX])->getValue(); - arrayIdx = (uint64_t) (int) arrayIdx; // sign-extend from 32 to 64 bits - Result += arrayIdx * elementSize; + Result += (uint64_t) (int) (arrayIdx * elementSize); // sign-extend } else if (const StructType *STy = dyn_cast(Ty)) { assert(Idx[CurIDX]->getType() == Type::UByteTy && "Illegal struct idx"); -- 2.34.1