replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Try to fix the MSVC build. 

llvm-svn: 223105
This commit is contained in:
Hans Wennborg 2014-12-02 02:13:09 +00:00
parent 07ba5121a1
commit 0101b540db
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
clang/lib/Lex/ModuleMap.cpp
View File

@ -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.

5
clang/lib/Serialization/ASTReader.cpp
View File

@ -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());
}
}