From: NAKAMURA Takumi <geek4civic@gmail.com>
Date: Fri, 8 Aug 2014 09:51:07 +0000 (+0000)
Subject: clangAnalysis: Avoid member initializers in TempDtorContext to appease msc17.
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a7492b9090ab3b12a66611c7494987c0adf2b43f;p=clang

clangAnalysis: Avoid member initializers in TempDtorContext to appease msc17.

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

diff --git a/lib/Analysis/CFG.cpp b/lib/Analysis/CFG.cpp
index 49f35ef10f..4a0d4e8e46 100644
--- a/lib/Analysis/CFG.cpp
+++ b/lib/Analysis/CFG.cpp
@@ -445,10 +445,13 @@ private:
   ///     if the CXXBindTemporaryExpr was marked executed, and otherwise
   ///     branches to the stored successor.
   struct TempDtorContext {
-    TempDtorContext() : KnownExecuted(true) {}
+    TempDtorContext()
+        : IsConditional(false), KnownExecuted(true), Succ(nullptr),
+          TerminatorExpr(nullptr) {}
 
     TempDtorContext(TryResult KnownExecuted)
-        : IsConditional(true), KnownExecuted(KnownExecuted) {}
+        : IsConditional(true), KnownExecuted(KnownExecuted), Succ(nullptr),
+          TerminatorExpr(nullptr) {}
 
     /// Returns whether we need to start a new branch for a temporary destructor
     /// call. This is the case when the the temporary destructor is
@@ -467,10 +470,10 @@ private:
       TerminatorExpr = E;
     }
 
-    const bool IsConditional = false;
+    const bool IsConditional;
     const TryResult KnownExecuted;
-    CFGBlock *Succ = nullptr;
-    CXXBindTemporaryExpr *TerminatorExpr = nullptr;
+    CFGBlock *Succ;
+    CXXBindTemporaryExpr *TerminatorExpr;
   };
 
   // Visitors to walk an AST and generate destructors of temporaries in