Author: Wei Yi Tee Date: 2022-07-13T11:40:37Z New Revision: 3ec2b2f4ec3205a5b11c083b80566292d6ee2ecb
URL: https://github.com/llvm/llvm-project/commit/3ec2b2f4ec3205a5b11c083b80566292d6ee2ecb DIFF: https://github.com/llvm/llvm-project/commit/3ec2b2f4ec3205a5b11c083b80566292d6ee2ecb.diff LOG: [clang][dataflow] Rename `Status` field in a `Solver::Result` struct to `SATCheckStatus`. Previously, `Status` was named after the enum type `Status` which caused the enum to be hidden by the non-type declaration of the `Status` field. This patch fixes this issue by using different names for the field and type. Differential Revision: https://reviews.llvm.org/D129568 Added: Modified: clang/include/clang/Analysis/FlowSensitive/Solver.h Removed: ################################################################################ diff --git a/clang/include/clang/Analysis/FlowSensitive/Solver.h b/clang/include/clang/Analysis/FlowSensitive/Solver.h index b7a14f3484e42..93568b1197933 100644 --- a/clang/include/clang/Analysis/FlowSensitive/Solver.h +++ b/clang/include/clang/Analysis/FlowSensitive/Solver.h @@ -60,7 +60,7 @@ class Solver { /// Returns the status of satisfiability checking on the queried boolean /// formula. - Status getStatus() const { return Status; } + Status getStatus() const { return SATCheckStatus; } /// Returns a truth assignment to boolean values that satisfies the queried /// boolean formula if available. Otherwise, an empty optional is returned. @@ -71,11 +71,11 @@ class Solver { private: Result( - enum Status Status, + enum Status SATCheckStatus, llvm::Optional<llvm::DenseMap<AtomicBoolValue *, Assignment>> Solution) - : Status(Status), Solution(std::move(Solution)) {} + : SATCheckStatus(SATCheckStatus), Solution(std::move(Solution)) {} - Status Status; + Status SATCheckStatus; llvm::Optional<llvm::DenseMap<AtomicBoolValue *, Assignment>> Solution; }; _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
