From: Vassil Vassilev <v.g.vassilev@gmail.com>
Date: Fri, 30 Jun 2017 09:25:43 +0000 (+0000)
Subject: Ambiguity might be also uninitialized. Use llvm::Optional.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0c223be753a86df1bef5ace82e5a3e11020c026c;p=clang

Ambiguity might be also uninitialized. Use llvm::Optional.



git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@306809 91177308-0d34-0410-b5e6-96231b3b80d8
---

diff --git a/include/clang/Sema/Lookup.h b/include/clang/Sema/Lookup.h
index 145355c5ec..fc16ad2e81 100644
--- a/include/clang/Sema/Lookup.h
+++ b/include/clang/Sema/Lookup.h
@@ -18,6 +18,8 @@
 #include "clang/AST/DeclCXX.h"
 #include "clang/Sema/Sema.h"
 
+#include "llvm/ADT/Optional.h"
+
 namespace clang {
 
 /// @brief Represents the results of name lookup.
@@ -465,9 +467,10 @@ public:
         Paths = nullptr;
       }
     } else {
-      AmbiguityKind SavedAK = Ambiguity;
+      llvm::Optional<AmbiguityKind> SavedAK;
       bool WasAmbiguous = false;
       if (ResultKind == Ambiguous) {
+        SavedAK = Ambiguity;
         WasAmbiguous = true;
       }
       ResultKind = Found;
@@ -478,7 +481,7 @@ public:
       if (ResultKind == Ambiguous) {
         (void)WasAmbiguous;
         assert(WasAmbiguous);
-        Ambiguity = SavedAK;
+        Ambiguity = SavedAK.getValue();
       } else if (Paths) {
         deletePaths(Paths);
         Paths = nullptr;