From 05a896a8d1745c260ac21577c3e12ddee4ea1923 Mon Sep 17 00:00:00 2001 From: James Molloy Date: Fri, 23 Oct 2015 14:17:03 +0000 Subject: [BasicAA] Bugfix for r251016 If the loaded type sizes don't match the element type of the sequential type, all bets are off and the addresses may, indeed, overlap. Surprisingly, this just got caught in one test, on one builder, out of the 30+ builders testing this change. Congratulations go to http://lab.llvm.org:8011/builders/clang-aarch64-lnt/builds/5205. llvm-svn: 251112 --- llvm/lib/Analysis/BasicAliasAnalysis.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'llvm/lib/Analysis/BasicAliasAnalysis.cpp') diff --git a/llvm/lib/Analysis/BasicAliasAnalysis.cpp b/llvm/lib/Analysis/BasicAliasAnalysis.cpp index 7c12555..59b2953 100644 --- a/llvm/lib/Analysis/BasicAliasAnalysis.cpp +++ b/llvm/lib/Analysis/BasicAliasAnalysis.cpp @@ -815,11 +815,17 @@ static AliasResult aliasSameBasePointerGEPs(const GEPOperator *GEP1, // Because array indices greater than the number of elements are valid in // GEPs, unless we know the intermediate indices are identical between // GEP1 and GEP2 we cannot guarantee that the last indexed arrays don't - // partially overlap. + // partially overlap. We also need to check that the loaded size matches + // the element size, otherwise we could still have overlap. + const uint64_t ElementSize = + DL.getTypeStoreSize(cast(Ty)->getElementType()); + if (V1Size != ElementSize || V2Size != ElementSize) + return MayAlias; + for (unsigned i = 0, e = GEP1->getNumIndices() - 1; i != e; ++i) if (GEP1->getOperand(i + 1) != GEP2->getOperand(i + 1)) return MayAlias; - + // Now we know that the array/pointer that GEP1 indexes into and that // that GEP2 indexes into must either precisely overlap or be disjoint. // Because they cannot partially overlap and because fields in an array -- cgit v1.1