diff --git a/clang/include/clang/Analysis/FlowSensitive/Solver.h b/clang/include/clang/Analysis/FlowSensitive/Solver.h
--- a/clang/include/clang/Analysis/FlowSensitive/Solver.h
+++ b/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;
   };