From b982b0f61ba0147eb3d502a524bffa288f4e6428 Mon Sep 17 00:00:00 2001
From: Richard Smith <richard-llvm@metafoo.co.uk>
Date: Sun, 17 Jul 2016 20:00:59 +0000
Subject: [PATCH] Attempt to work around MSVC rejects-valid, round 2.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@275730 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Frontend/ChainedIncludesSource.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/Frontend/ChainedIncludesSource.cpp b/lib/Frontend/ChainedIncludesSource.cpp
index 708e262de6..3f126615b1 100644
--- a/lib/Frontend/ChainedIncludesSource.cpp
+++ b/lib/Frontend/ChainedIncludesSource.cpp
@@ -54,6 +54,10 @@ private:
 /// Members of ChainedIncludesSource, factored out so we can initialize
 /// them before we initialize the ExternalSemaSource base class.
 struct ChainedIncludesSourceMembers {
+  ChainedIncludesSourceMembers(
+      std::vector<std::unique_ptr<CompilerInstance>> CIs,
+      IntrusiveRefCntPtr<ExternalSemaSource> FinalReader)
+      : Impl(std::move(CIs)), FinalReader(std::move(FinalReader)) {}
   ChainedIncludesSourceImpl Impl;
   IntrusiveRefCntPtr<ExternalSemaSource> FinalReader;
 };
@@ -66,8 +70,7 @@ class ChainedIncludesSource
 public:
   ChainedIncludesSource(std::vector<std::unique_ptr<CompilerInstance>> CIs,
                         IntrusiveRefCntPtr<ExternalSemaSource> FinalReader)
-      : ChainedIncludesSourceMembers(ChainedIncludesSourceMembers{
-            {std::move(CIs)}, std::move(FinalReader)}),
+      : ChainedIncludesSourceMembers(std::move(CIs), std::move(FinalReader)),
         MultiplexExternalSemaSource(Impl, *this->FinalReader) {}
 };
 }
-- 
2.40.0