Author: Nico Weber Date: 2021-06-28T11:32:57-04:00 New Revision: d5402a2fee5d860e20378f819e200865af3a6113
URL: https://github.com/llvm/llvm-project/commit/d5402a2fee5d860e20378f819e200865af3a6113 DIFF: https://github.com/llvm/llvm-project/commit/d5402a2fee5d860e20378f819e200865af3a6113.diff LOG: Revert "[Analyzer][solver] Add dump methods for (dis)equality classes." This reverts commit 6f3b775c3e9c685f74ecbe2ce1a94af52cc17c2f. Test fails flakily, see comments on https://reviews.llvm.org/D103967 Also revert follow-up "[Analyzer] Attempt to fix windows bots test failure b/c of new-line" This reverts commit fe0e861a4d9946a3e7de1bc95a3ec12fa602b492. Added: Modified: clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp clang/test/Analysis/expr-inspection.c Removed: clang/test/Analysis/expr-inspection-printState-diseq-info.c clang/test/Analysis/expr-inspection-printState-eq-classes.c ################################################################################ diff --git a/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp b/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp index c3d8a0a87635..0e57a1a5040f 100644 --- a/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp +++ b/clang/lib/StaticAnalyzer/Core/RangeConstraintManager.cpp @@ -592,11 +592,6 @@ class EquivalenceClass : public llvm::FoldingSetNode { RangeSet::Factory &F, ProgramStateRef State); - void dumpToStream(ProgramStateRef State, raw_ostream &os) const; - LLVM_DUMP_METHOD void dump(ProgramStateRef State) const { - dumpToStream(State, llvm::errs()); - } - /// Check equivalence data for consistency. LLVM_NODISCARD LLVM_ATTRIBUTE_UNUSED static bool isClassDataConsistent(ProgramStateRef State); @@ -1410,17 +1405,6 @@ class RangeConstraintManager : public RangedConstraintManager { void printJson(raw_ostream &Out, ProgramStateRef State, const char *NL = "\n", unsigned int Space = 0, bool IsDot = false) const override; - void printConstraints(raw_ostream &Out, ProgramStateRef State, - const char *NL = "\n", unsigned int Space = 0, - bool IsDot = false) const; - void printEquivalenceClasses(raw_ostream &Out, ProgramStateRef State, - const char *NL = "\n", unsigned int Space = 0, - bool IsDot = false) const; - void printEquivalenceClass(raw_ostream &Out, ProgramStateRef State, - EquivalenceClass Class) const; - void printDisequalities(raw_ostream &Out, ProgramStateRef State, - const char *NL = "\n", unsigned int Space = 0, - bool IsDot = false) const; //===------------------------------------------------------------------===// // Implementation for interface from RangedConstraintManager. @@ -1644,15 +1628,6 @@ ConstraintMap ento::getConstraintMap(ProgramStateRef State) { // EqualityClass implementation details //===----------------------------------------------------------------------===// -LLVM_DUMP_METHOD void EquivalenceClass::dumpToStream(ProgramStateRef State, - raw_ostream &os) const { - SymbolSet ClassMembers = getClassMembers(State); - for (const SymbolRef &MemberSym : ClassMembers) { - MemberSym->dump(); - os << "\n"; - } -} - inline EquivalenceClass EquivalenceClass::find(ProgramStateRef State, SymbolRef Sym) { assert(State && "State should not be null"); @@ -2493,16 +2468,6 @@ ProgramStateRef RangeConstraintManager::assumeSymOutsideInclusiveRange( void RangeConstraintManager::printJson(raw_ostream &Out, ProgramStateRef State, const char *NL, unsigned int Space, bool IsDot) const { - printConstraints(Out, State, NL, Space, IsDot); - printEquivalenceClasses(Out, State, NL, Space, IsDot); - printDisequalities(Out, State, NL, Space, IsDot); -} - -void RangeConstraintManager::printConstraints(raw_ostream &Out, - ProgramStateRef State, - const char *NL, - unsigned int Space, - bool IsDot) const { ConstraintRangeTy Constraints = State->get<ConstraintRange>(); Indent(Out, Space, IsDot) << "\"constraints\": "; @@ -2536,106 +2501,3 @@ void RangeConstraintManager::printConstraints(raw_ostream &Out, --Space; Indent(Out, Space, IsDot) << "]," << NL; } - -void RangeConstraintManager::printEquivalenceClass( - raw_ostream &Out, ProgramStateRef State, EquivalenceClass Class) const { - bool FirstMember = true; - SymbolSet ClassMembers = Class.getClassMembers(State); - Out << "[ "; - for (SymbolRef ClassMember : ClassMembers) { - if (FirstMember) - FirstMember = false; - else - Out << ", "; - Out << "\"" << ClassMember << "\""; - } - Out << " ]"; -} - -void RangeConstraintManager::printEquivalenceClasses(raw_ostream &Out, - ProgramStateRef State, - const char *NL, - unsigned int Space, - bool IsDot) const { - ClassMembersTy Members = State->get<ClassMembers>(); - - Indent(Out, Space, IsDot) << "\"equivalence_classes\": "; - if (Members.isEmpty()) { - Out << "null," << NL; - return; - } - - ++Space; - Out << '[' << NL; - bool FirstClass = true; - for (std::pair<EquivalenceClass, SymbolSet> ClassToSymbolSet : Members) { - EquivalenceClass Class = ClassToSymbolSet.first; - - if (FirstClass) { - FirstClass = false; - } else { - Out << ','; - Out << NL; - } - Indent(Out, Space, IsDot); - printEquivalenceClass(Out, State, Class); - } - Out << NL; - - --Space; - Indent(Out, Space, IsDot) << "]," << NL; -} - -void RangeConstraintManager::printDisequalities(raw_ostream &Out, - ProgramStateRef State, - const char *NL, - unsigned int Space, - bool IsDot) const { - DisequalityMapTy Disequalities = State->get<DisequalityMap>(); - - Indent(Out, Space, IsDot) << "\"disequality_info\": "; - if (Disequalities.isEmpty()) { - Out << "null," << NL; - return; - } - - ++Space; - Out << '[' << NL; - bool FirstClass = true; - for (std::pair<EquivalenceClass, ClassSet> ClassToDisEqSet : Disequalities) { - EquivalenceClass Class = ClassToDisEqSet.first; - if (FirstClass) { - FirstClass = false; - } else { - Out << ','; - Out << NL; - } - Indent(Out, Space, IsDot) << "{" << NL; - unsigned int DisEqSpace = Space + 1; - Indent(Out, DisEqSpace, IsDot) << "\"class\": "; - printEquivalenceClass(Out, State, Class); - ClassSet DisequalClasses = ClassToDisEqSet.second; - if (!DisequalClasses.isEmpty()) { - Out << "," << NL; - Indent(Out, DisEqSpace, IsDot) << "\"disequal_to\": [" << NL; - unsigned int DisEqClassSpace = DisEqSpace + 1; - Indent(Out, DisEqClassSpace, IsDot); - bool FirstDisEqClass = true; - for (EquivalenceClass DisEqClass : DisequalClasses) { - if (FirstDisEqClass) { - FirstDisEqClass = false; - } else { - Out << ',' << NL; - Indent(Out, DisEqClassSpace, IsDot); - } - printEquivalenceClass(Out, State, DisEqClass); - } - Out << "]" << NL; - } - Indent(Out, Space, IsDot) << "}"; - } - Out << NL; - - --Space; - Indent(Out, Space, IsDot) << "]," << NL; -} diff --git a/clang/test/Analysis/expr-inspection-printState-diseq-info.c b/clang/test/Analysis/expr-inspection-printState-diseq-info.c deleted file mode 100644 index 3f11ed61af5e..000000000000 --- a/clang/test/Analysis/expr-inspection-printState-diseq-info.c +++ /dev/null @@ -1,35 +0,0 @@ -// RUN: %clang_analyze_cc1 \ -// RUN: -analyzer-checker=debug.ExprInspection %s 2>&1 | FileCheck %s -// UNSUPPORTED: windows - -void clang_analyzer_printState(); - -void test_disequality_info(int e0, int b0, int b1, int c0) { - int e1 = e0 - b0; - if (b0 == 2) { - int e2 = e1 - b1; - if (e2 > 0) { - if (b1 != c0) - clang_analyzer_printState(); - } - } -} - -// CHECK: "disequality_info": [ -// CHECK-NEXT: { -// CHECK-NEXT: "class": [ "reg_$2<int b1>" ], -// CHECK-NEXT: "disequal_to": [ -// CHECK-NEXT: [ "(reg_$0<int e0>) - 2" ], -// CHECK-NEXT: [ "reg_$3<int c0>" ]] -// CHECK-NEXT: }, -// CHECK-NEXT: { -// CHECK-NEXT: "class": [ "(reg_$0<int e0>) - 2" ], -// CHECK-NEXT: "disequal_to": [ -// CHECK-NEXT: [ "reg_$2<int b1>" ]] -// CHECK-NEXT: }, -// CHECK-NEXT: { -// CHECK-NEXT: "class": [ "reg_$3<int c0>" ], -// CHECK-NEXT: "disequal_to": [ -// CHECK-NEXT: [ "reg_$2<int b1>" ]] -// CHECK-NEXT: } -// CHECK-NEXT: ], diff --git a/clang/test/Analysis/expr-inspection-printState-eq-classes.c b/clang/test/Analysis/expr-inspection-printState-eq-classes.c deleted file mode 100644 index 7daa8648c249..000000000000 --- a/clang/test/Analysis/expr-inspection-printState-eq-classes.c +++ /dev/null @@ -1,22 +0,0 @@ -// RUN: %clang_analyze_cc1 \ -// RUN: -analyzer-checker=debug.ExprInspection %s 2>&1 | FileCheck %s -// UNSUPPORTED: windows - -void clang_analyzer_printState(); - -void test_equivalence_classes(int a, int b, int c, int d) { - if (a + b != c) - return; - if (a != d) - return; - if (b != 0) - return; - clang_analyzer_printState(); - (void)(a * b * c * d); - return; -} - -// CHECK: "equivalence_classes": [ -// CHECK-NEXT: [ "reg_$0<int a>", "(reg_$0<int a>) + (reg_$1<int b>)", "reg_$2<int c>", "reg_$3<int d>" ], -// CHECK-NEXT: [ "((reg_$0<int a>) + (reg_$1<int b>)) != (reg_$2<int c>)", "(reg_$0<int a>) != (reg_$2<int c>)" ] -// CHECK-NEXT: ], diff --git a/clang/test/Analysis/expr-inspection.c b/clang/test/Analysis/expr-inspection.c index 76118a76e71c..283fa9bdb724 100644 --- a/clang/test/Analysis/expr-inspection.c +++ b/clang/test/Analysis/expr-inspection.c @@ -38,8 +38,6 @@ void foo(int x) { // CHECK-NEXT: "constraints": [ // CHECK-NEXT: { "symbol": "reg_$0<int x>", "range": "{ [-2147483648, 13] }" } // CHECK-NEXT: ], -// CHECK-NEXT: "equivalence_classes": null, -// CHECK-NEXT: "disequality_info": null, // CHECK-NEXT: "dynamic_types": null, // CHECK-NEXT: "dynamic_casts": null, // CHECK-NEXT: "constructing_objects": null, _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
