[PATCH] D129568: [clang][dataflow] Rename `Status` field in a `Solver::Result` struct to `SATCheckStatus`.

[weiyi via Phabricator via cfe-commits]

wyt created this revision.
Herald added subscribers: martong, tschuett, xazax.hun.
Herald added a reviewer: NoQ.
Herald added a project: All.
wyt requested review of this revision.
Herald added a project: clang.
Herald added a subscriber: cfe-commits.

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.

Depends On D129547 <https://reviews.llvm.org/D129547>


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D129568

Files:
  clang/include/clang/Analysis/FlowSensitive/Solver.h


Index: clang/include/clang/Analysis/FlowSensitive/Solver.h
===================================================================
--- clang/include/clang/Analysis/FlowSensitive/Solver.h
+++ clang/include/clang/Analysis/FlowSensitive/Solver.h
@@ -60,7 +60,7 @@
 
     /// 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 @@
 
   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;
   };
 



Index: clang/include/clang/Analysis/FlowSensitive/Solver.h
===================================================================
--- clang/include/clang/Analysis/FlowSensitive/Solver.h
+++ clang/include/clang/Analysis/FlowSensitive/Solver.h
@@ -60,7 +60,7 @@
 
     /// 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 @@
 
   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