From 1046e41998ac9178d87226cb0869612c22f5c6d1 Mon Sep 17 00:00:00 2001 From: Dan Gohman Date: Thu, 3 Sep 2009 23:34:49 +0000 Subject: Revert 80959. It isn't sufficient to solve the full problem. And it introduced regressions in the Ocaml bindings tests. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@80969 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Analysis/ConstantFolding.cpp | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'lib/Analysis') diff --git a/lib/Analysis/ConstantFolding.cpp b/lib/Analysis/ConstantFolding.cpp index 9bc0093..109eaad 100644 --- a/lib/Analysis/ConstantFolding.cpp +++ b/lib/Analysis/ConstantFolding.cpp @@ -203,21 +203,15 @@ static Constant *SymbolicallyEvaluateGEP(Constant* const* Ops, unsigned NumOps, if (Offset != 0) return 0; - // Create the GEP constant expr. - Constant *C = ConstantExpr::getGetElementPtr(Ptr, - &NewIdxs[0], NewIdxs.size()); - assert(cast(C->getType())->getElementType() == Ty && - "Computed GetElementPtr has unexpected type!"); - // If the base is the start of a GlobalVariable and all the array indices // remain in their static bounds, the GEP is inbounds. We can check that // all indices are in bounds by just checking the first index only - // because we've just normalized all the indices. We can mutate the - // Constant in place because we've proven that the indices are in bounds, - // so they'll always be in bounds. - if (isa(Ptr) && NewIdxs[0]->isNullValue()) - if (GEPOperator *GEP = dyn_cast(C)) - GEP->setIsInBounds(true); + // because we've just normalized all the indices. + Constant *C = isa(Ptr) && NewIdxs[0]->isNullValue() ? + ConstantExpr::getInBoundsGetElementPtr(Ptr, &NewIdxs[0], NewIdxs.size()) : + ConstantExpr::getGetElementPtr(Ptr, &NewIdxs[0], NewIdxs.size()); + assert(cast(C->getType())->getElementType() == Ty && + "Computed GetElementPtr has unexpected type!"); // If we ended up indexing a member with a type that doesn't match // the type of what the original indices indexed, add a cast. -- cgit v1.1