Try to fix the MSVC build.

llvm-svn: 223105

2 files changed, 10 insertions, 11 deletions

diff --git a/clang/lib/Lex/ModuleMap.cpp b/clang/lib/Lex/ModuleMap.cpp
index a270b56e6af..9ac554ae96c 100644
--- a/clang/lib/Lex/ModuleMap.cpp
+++ b/clang/lib/Lex/ModuleMap.cpp
@@ -1786,23 +1786,23 @@ void ModuleMapParser::parseHeaderDecl(MMToken::TokenKind LeadingToken,
         Map.setUmbrellaHeader(ActiveModule, File);
       }
     } else if (LeadingToken == MMToken::ExcludeKeyword) {
-      Map.excludeHeader(ActiveModule,
-                        Module::Header{RelativePathName.str(), File});
+      Module::Header H = {RelativePathName.str(), File};
+      Map.excludeHeader(ActiveModule, H);
     } else {
       // If there is a builtin counterpart to this file, add it now, before
       // the "real" header, so we build the built-in one first when building
       // the module.
-      if (BuiltinFile)
+      if (BuiltinFile) {
         // FIXME: Taking the name from the FileEntry is unstable and can give
         // different results depending on how we've previously named that file
         // in this build.
-        Map.addHeader(ActiveModule,
-                      Module::Header{BuiltinFile->getName(), BuiltinFile},
-                      Role);
+        Module::Header H = { BuiltinFile->getName(), BuiltinFile };
+        Map.addHeader(ActiveModule, H, Role);
+      }
 
       // Record this header.
-      Map.addHeader(ActiveModule, Module::Header{RelativePathName.str(), File},
-                    Role);
+      Module::Header H = { RelativePathName.str(), File };
+      Map.addHeader(ActiveModule, H, Role);
     }
   } else if (LeadingToken != MMToken::ExcludeKeyword) {
     // Ignore excluded header files. They're optional anyway.
diff --git a/clang/lib/Serialization/ASTReader.cpp b/clang/lib/Serialization/ASTReader.cpp
index e1daa04647f..b253704a361 100644
--- a/clang/lib/Serialization/ASTReader.cpp
+++ b/clang/lib/Serialization/ASTReader.cpp
@@ -1563,9 +1563,8 @@ HeaderFileInfoTrait::ReadData(internal_key_ref key, const unsigned char *d,
       // information should be propagated through the SUBMODULE_HEADER etc
       // records rather than from here.
       // FIXME: We don't ever mark excluded headers.
-      ModMap.addHeader(
-          Mod, Module::Header{key.Filename, FileMgr.getFile(key.Filename)},
-          HFI.getHeaderRole());
+      Module::Header H = { key.Filename, FileMgr.getFile(key.Filename) };
+      ModMap.addHeader(Mod, H, HFI.getHeaderRole());
     }
   }