Author: george.karpenkov Date: Mon Feb 26 13:32:57 2018 New Revision: 326131
URL: http://llvm.org/viewvc/llvm-project?rev=326131&view=rev Log: Revert "[analyzer] Quickfix: do not overflow in calculating offset in RegionManager" This reverts commit df306c4c5ab4a6b8d3c47432346d1f9b90c328b4. Reverting until I can figured out the reasons for failures. Removed: cfe/trunk/test/Analysis/region_store_overflow.c Modified: cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp cfe/trunk/test/Analysis/region-store.cpp Modified: cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp?rev=326131&r1=326130&r2=326131&view=diff ============================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp (original) +++ cfe/trunk/lib/StaticAnalyzer/Core/MemRegion.cpp Mon Feb 26 13:32:57 2018 @@ -23,11 +23,6 @@ #include "clang/Basic/SourceManager.h" #include "clang/StaticAnalyzer/Core/PathSensitive/SValBuilder.h" #include "llvm/Support/raw_ostream.h" -#include "llvm/Support/Debug.h" - -#include<functional> - -#define DEBUG_TYPE "MemRegion" using namespace clang; using namespace ento; @@ -1154,36 +1149,6 @@ const SymbolicRegion *MemRegion::getSymb return nullptr; } -/// Perform a given operation on two integers, return whether it overflows. -/// Optionally write the resulting output into \p Res. -static bool checkedOp( - int64_t LHS, - int64_t RHS, - std::function<llvm::APInt(llvm::APInt *, const llvm::APInt &, bool &)> Op, - int64_t *Res = nullptr) { - llvm::APInt ALHS(/*BitSize=*/64, LHS, /*Signed=*/true); - llvm::APInt ARHS(/*BitSize=*/64, RHS, /*Signed=*/true); - bool Overflow; - llvm::APInt Out = Op(&ALHS, ARHS, Overflow); - if (!Overflow && Res) - *Res = Out.getSExtValue(); - return Overflow; -} - -static bool checkedAdd( - int64_t LHS, - int64_t RHS, - int64_t *Res=nullptr) { - return checkedOp(LHS, RHS, &llvm::APInt::sadd_ov, Res); -} - -static bool checkedMul( - int64_t LHS, - int64_t RHS, - int64_t *Res=nullptr) { - return checkedOp(LHS, RHS, &llvm::APInt::smul_ov, Res); -} - RegionRawOffset ElementRegion::getAsArrayOffset() const { CharUnits offset = CharUnits::Zero(); const ElementRegion *ER = this; @@ -1211,17 +1176,6 @@ RegionRawOffset ElementRegion::getAsArra } CharUnits size = C.getTypeSizeInChars(elemType); - - int64_t Mult; - bool Overflow = checkedAdd(i, size.getQuantity(), &Mult); - Overflow |= checkedMul(Mult, offset.getQuantity()); - if (Overflow) { - DEBUG(llvm::dbgs() << "MemRegion::getAsArrayOffset: " - << "offset overflowing, returning unknown\n"); - - return nullptr; - } - offset += (i * size); } Modified: cfe/trunk/test/Analysis/region-store.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/region-store.cpp?rev=326131&r1=326130&r2=326131&view=diff ============================================================================== --- cfe/trunk/test/Analysis/region-store.cpp (original) +++ cfe/trunk/test/Analysis/region-store.cpp Mon Feb 26 13:32:57 2018 @@ -25,4 +25,4 @@ int radar13445834(Derived *Builder, Loc Builder->setLoc(l); return Builder->accessBase(); -} +} \ No newline at end of file Removed: cfe/trunk/test/Analysis/region_store_overflow.c URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/region_store_overflow.c?rev=326130&view=auto ============================================================================== --- cfe/trunk/test/Analysis/region_store_overflow.c (original) +++ cfe/trunk/test/Analysis/region_store_overflow.c (removed) @@ -1,13 +0,0 @@ -// REQUIRES: asserts -// RUN: %clang_analyze_cc1 -analyze -analyzer-checker=core -mllvm -debug %s 2>&1 | FileCheck %s - -int **h; -int overflow_in_memregion(long j) { - for (int l = 0;; ++l) { - if (j - l > 0) - return h[j - l][0]; // no-crash - } - return 0; -} -// CHECK: {{.*}} -// CHECK: MemRegion::getAsArrayOffset: offset overflowing, returning unknown _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
