Index: cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h =================================================================== --- cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h +++ cfe/trunk/include/clang/StaticAnalyzer/Core/AnalyzerOptions.h @@ -318,8 +318,8 @@ /// \sa shouldDisplayNotesAsEvents Optional DisplayNotesAsEvents; - /// \sa shouldAggressivelySimplifyRelationalComparison - Optional AggressiveRelationalComparisonSimplification; + /// \sa shouldAggressivelySimplifyBinaryOperation + Optional AggressiveBinaryOperationSimplification; /// \sa getCTUDir Optional CTUDir; @@ -690,19 +690,19 @@ /// to false when unset. bool shouldDisplayNotesAsEvents(); - /// Returns true if SValBuilder should rearrange comparisons of symbolic - /// expressions which consist of a sum of a symbol and a concrete integer - /// into the format where symbols are on the left-hand side and the integer - /// is on the right. This is only done if both symbols and both concrete - /// integers are signed, greater than or equal to the quarter of the minimum - /// value of the type and less than or equal to the quarter of the maximum - /// value of that type. - /// - /// A + n B + m becomes A - B m - n, where A and B symbolic, - /// n and m are integers. is any of '==', '!=', '<', '<=', '>' or '>='. - /// The rearrangement also happens with '-' instead of '+' on either or both - /// side and also if any or both integers are missing. - bool shouldAggressivelySimplifyRelationalComparison(); + /// Returns true if SValBuilder should rearrange comparisons and additive + /// operations of symbolic expressions which consist of a sum of a symbol and + /// a concrete integer into the format where symbols are on the left-hand + /// side and the integer is on the right. This is only done if both symbols + /// and both concrete integers are signed, greater than or equal to the + /// quarter of the minimum value of the type and less than or equal to the + /// quarter of the maximum value of that type. + /// + /// A + n B + m becomes A - B m - n, where A and B symbolic, + /// n and m are integers. is any of '==', '!=', '<', '<=', '>', '>=', + /// '+' or '-'. The rearrangement also happens with '-' instead of '+' on + // either or both side and also if any or both integers are missing. + bool shouldAggressivelySimplifyBinaryOperation(); /// Returns the directory containing the CTU related files. StringRef getCTUDir(); Index: cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp =================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp +++ cfe/trunk/lib/StaticAnalyzer/Core/AnalyzerOptions.cpp @@ -463,12 +463,12 @@ return DisplayNotesAsEvents.getValue(); } -bool AnalyzerOptions::shouldAggressivelySimplifyRelationalComparison() { - if (!AggressiveRelationalComparisonSimplification.hasValue()) - AggressiveRelationalComparisonSimplification = - getBooleanOption("aggressive-relational-comparison-simplification", +bool AnalyzerOptions::shouldAggressivelySimplifyBinaryOperation() { + if (!AggressiveBinaryOperationSimplification.hasValue()) + AggressiveBinaryOperationSimplification = + getBooleanOption("aggressive-binary-operation-simplification", /*Default=*/false); - return AggressiveRelationalComparisonSimplification.getValue(); + return AggressiveBinaryOperationSimplification.getValue(); } StringRef AnalyzerOptions::getCTUDir() { Index: cfe/trunk/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp =================================================================== --- cfe/trunk/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp +++ cfe/trunk/lib/StaticAnalyzer/Core/SimpleSValBuilder.cpp @@ -456,14 +456,17 @@ auto &Opts = StateMgr.getOwningEngine()->getAnalysisManager().getAnalyzerOptions(); + // FIXME: After putting complexity threshold to the symbols we can always + // rearrange additive operations but rearrange comparisons only if + // option is set. + if(!Opts.shouldAggressivelySimplifyBinaryOperation()) + return None; + SymbolRef LSym = Lhs.getAsSymbol(); if (!LSym) return None; - // Always rearrange additive operations but rearrange comparisons only if - // option is set. - if (BinaryOperator::isComparisonOp(Op) && - Opts.shouldAggressivelySimplifyRelationalComparison()) { + if (BinaryOperator::isComparisonOp(Op)) { SingleTy = LSym->getType(); if (ResultTy != SVB.getConditionType()) return None; Index: cfe/trunk/test/Analysis/constraint_manager_negate_difference.c =================================================================== --- cfe/trunk/test/Analysis/constraint_manager_negate_difference.c +++ cfe/trunk/test/Analysis/constraint_manager_negate_difference.c @@ -1,4 +1,4 @@ -// RUN: %clang_analyze_cc1 -analyzer-checker=debug.ExprInspection,core.builtin -analyzer-config aggressive-relational-comparison-simplification=true -verify %s +// RUN: %clang_analyze_cc1 -analyzer-checker=debug.ExprInspection,core.builtin -analyzer-config aggressive-binary-operation-simplification=true -verify %s void clang_analyzer_eval(int); Index: cfe/trunk/test/Analysis/iterator-range.cpp =================================================================== --- cfe/trunk/test/Analysis/iterator-range.cpp +++ cfe/trunk/test/Analysis/iterator-range.cpp @@ -1,5 +1,5 @@ -// RUN: %clang_analyze_cc1 -std=c++11 -analyzer-checker=core,cplusplus,alpha.cplusplus.IteratorRange -analyzer-eagerly-assume -analyzer-config aggressive-relational-comparison-simplification=true -analyzer-config c++-container-inlining=false %s -verify -// RUN: %clang_analyze_cc1 -std=c++11 -analyzer-checker=core,cplusplus,alpha.cplusplus.IteratorRange -analyzer-eagerly-assume -analyzer-config aggressive-relational-comparison-simplification=true -analyzer-config c++-container-inlining=true -DINLINE=1 %s -verify +// RUN: %clang_analyze_cc1 -std=c++11 -analyzer-checker=core,cplusplus,alpha.cplusplus.IteratorRange -analyzer-eagerly-assume -analyzer-config aggressive-binary-operation-simplification=true -analyzer-config c++-container-inlining=false %s -verify +// RUN: %clang_analyze_cc1 -std=c++11 -analyzer-checker=core,cplusplus,alpha.cplusplus.IteratorRange -analyzer-eagerly-assume -analyzer-config aggressive-binary-operation-simplification=true -analyzer-config c++-container-inlining=true -DINLINE=1 %s -verify #include "Inputs/system-header-simulator-cxx.h" Index: cfe/trunk/test/Analysis/plist-macros.cpp =================================================================== --- cfe/trunk/test/Analysis/plist-macros.cpp +++ cfe/trunk/test/Analysis/plist-macros.cpp @@ -637,6 +637,69 @@ // CHECK-NEXT: end // CHECK-NEXT: // CHECK-NEXT: +// CHECK-NEXT: line36 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line36 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindevent +// CHECK-NEXT: location +// CHECK-NEXT: +// CHECK-NEXT: line36 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: ranges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line36 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line36 +// CHECK-NEXT: col25 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: depth0 +// CHECK-NEXT: extended_message +// CHECK-NEXT: Assuming the condition is true +// CHECK-NEXT: message +// CHECK-NEXT: Assuming the condition is true +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: kindcontrol +// CHECK-NEXT: edges +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: start +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line36 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: line36 +// CHECK-NEXT: col7 +// CHECK-NEXT: file0 +// CHECK-NEXT: +// CHECK-NEXT: +// CHECK-NEXT: end +// CHECK-NEXT: +// CHECK-NEXT: // CHECK-NEXT: line37 // CHECK-NEXT: col5 // CHECK-NEXT: file0 Index: cfe/trunk/test/Analysis/svalbuilder-rearrange-comparisons.c =================================================================== --- cfe/trunk/test/Analysis/svalbuilder-rearrange-comparisons.c +++ cfe/trunk/test/Analysis/svalbuilder-rearrange-comparisons.c @@ -1,4 +1,4 @@ -// RUN: %clang_analyze_cc1 -analyzer-checker=debug.ExprInspection,core.builtin -analyzer-config aggressive-relational-comparison-simplification=true -verify %s +// RUN: %clang_analyze_cc1 -analyzer-checker=debug.ExprInspection,core.builtin -analyzer-config aggressive-binary-operation-simplification=true -verify %s void clang_analyzer_dump(int x); void clang_analyzer_eval(int x);