From 96cc1d0dfbcf9c7ffffc65f0aa008ff532d444f4 Mon Sep 17 00:00:00 2001 From: Cameron Zwarich Date: Thu, 9 Jun 2011 01:45:33 +0000 Subject: [PATCH] Fix PR10104 by adding a bounds check on a vector element access check. It was assuming that all offsets are legal vector accesses, and thus trying to access the float member of { <2 x float>, float } as the 3rd element of the first member. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@132766 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Scalar/ScalarReplAggregates.cpp | 5 ++++- .../ScalarRepl/2011-06-08-VectorExtractValue.ll | 8 +++++--- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/lib/Transforms/Scalar/ScalarReplAggregates.cpp b/lib/Transforms/Scalar/ScalarReplAggregates.cpp index 9f286b56422..09e597fe666 100644 --- a/lib/Transforms/Scalar/ScalarReplAggregates.cpp +++ b/lib/Transforms/Scalar/ScalarReplAggregates.cpp @@ -342,7 +342,10 @@ void ConvertToScalarInfo::MergeInType(const Type *In, uint64_t Offset, // If we're accessing something that could be an element of a vector, see // if the implied vector agrees with what we already have and if Offset is // compatible with it. - if (Offset % EltSize == 0 && AllocaSize % EltSize == 0) { + if (Offset % EltSize == 0 && AllocaSize % EltSize == 0 && + Offset * 8 < + (VectorTy ? VectorTy->getPrimitiveSizeInBits() + : (AllocaSize / EltSize) * In->getPrimitiveSizeInBits())) { if (!VectorTy) { VectorTy = VectorType::get(In, AllocaSize/EltSize); return; diff --git a/test/Transforms/ScalarRepl/2011-06-08-VectorExtractValue.ll b/test/Transforms/ScalarRepl/2011-06-08-VectorExtractValue.ll index 0b008f48dbe..32e67fbce78 100644 --- a/test/Transforms/ScalarRepl/2011-06-08-VectorExtractValue.ll +++ b/test/Transforms/ScalarRepl/2011-06-08-VectorExtractValue.ll @@ -41,9 +41,11 @@ entry: ; CHECK: test2 ; CHECK-NOT: alloca -; CHECK: insertelement <2 x float> zeroinitializer -; CHECK: extractelement <2 x float> %tmp2 -; CHECK: extractelement <2 x float> %tmp2 +; CHECK: and i128 +; CHECK: or i128 +; CHECK: trunc i128 +; CHECK-NOT: insertelement +; CHECK-NOT: extractelement define float @test2() uwtable ssp { entry: -- 2.34.1