maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fixing code that doesn't compile in MSVC 2012 (but does in MSVC 2013) from r204417 and related commits. 

llvm-svn: 204471
This commit is contained in:
Aaron Ballman 2014-03-21 15:22:56 +00:00
parent e275e9216b
commit 4f45b71b10
4 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
clang/include/clang/Serialization/ASTReader.h
View File

@ -770,6 +770,9 @@ private:
struct ImportedSubmodule { struct ImportedSubmodule {
serialization::SubmoduleID ID; serialization::SubmoduleID ID;
SourceLocation ImportLoc; SourceLocation ImportLoc;
ImportedSubmodule(serialization::SubmoduleID ID, SourceLocation ImportLoc)
: ID(ID), ImportLoc(ImportLoc) {}
}; };
/// \brief A list of modules that were imported by precompiled headers or /// \brief A list of modules that were imported by precompiled headers or

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

@ -3017,7 +3017,7 @@ bool ASTReader::ReadASTBlock(ModuleFile &F) {
unsigned GlobalID = getGlobalSubmoduleID(F, Record[I++]); unsigned GlobalID = getGlobalSubmoduleID(F, Record[I++]);
SourceLocation Loc = ReadSourceLocation(F, Record, I); SourceLocation Loc = ReadSourceLocation(F, Record, I);
if (GlobalID) if (GlobalID)
ImportedModules.push_back({GlobalID, Loc}); ImportedModules.push_back(ImportedSubmodule(GlobalID, Loc));
} }
} }
break; break;

38
clang/lib/Serialization/ASTWriter.cpp
View File

@ -4082,7 +4082,7 @@ void ASTWriter::WriteASTCore(Sema &SemaRef,
if (NamespaceDecl *NS = TU->getAnonymousNamespace()) { if (NamespaceDecl *NS = TU->getAnonymousNamespace()) {
ASTWriter::UpdateRecord &Record = DeclUpdates[TU]; ASTWriter::UpdateRecord &Record = DeclUpdates[TU];
if (Record.empty()) if (Record.empty())
Record.push_back({UPD_CXX_ADDED_ANONYMOUS_NAMESPACE, NS}); Record.push_back(DeclUpdate(UPD_CXX_ADDED_ANONYMOUS_NAMESPACE, NS));
} }
// Add update records for all mangling numbers and static local numbers. // Add update records for all mangling numbers and static local numbers.
@ -4090,11 +4090,12 @@ void ASTWriter::WriteASTCore(Sema &SemaRef,
// tagging this rare extra data onto the declarations. // tagging this rare extra data onto the declarations.
for (const auto &Number : Context.MangleNumbers) for (const auto &Number : Context.MangleNumbers)
if (!Number.first->isFromASTFile()) if (!Number.first->isFromASTFile())
DeclUpdates[Number.first].push_back({UPD_MANGLING_NUMBER, Number.second}); DeclUpdates[Number.first].push_back(DeclUpdate(UPD_MANGLING_NUMBER,
Number.second));
for (const auto &Number : Context.StaticLocalNumbers) for (const auto &Number : Context.StaticLocalNumbers)
if (!Number.first->isFromASTFile()) if (!Number.first->isFromASTFile())
DeclUpdates[Number.first].push_back({UPD_STATIC_LOCAL_NUMBER, DeclUpdates[Number.first].push_back(DeclUpdate(UPD_STATIC_LOCAL_NUMBER,
Number.second}); Number.second));
// Make sure visible decls, added to DeclContexts previously loaded from // Make sure visible decls, added to DeclContexts previously loaded from
// an AST file, are registered for serialization. // an AST file, are registered for serialization.
@ -4291,12 +4292,16 @@ void ASTWriter::WriteASTCore(Sema &SemaRef,
if (!WritingModule) { if (!WritingModule) {
// Write the submodules that were imported, if any. // Write the submodules that were imported, if any.
struct ModuleInfo { uint64_t ID; Module *M; }; struct ModuleInfo {
uint64_t ID;
Module *M;
ModuleInfo(uint64_t ID, Module *M) : ID(ID), M(M) {}
};
llvm::SmallVector<ModuleInfo, 64> Imports; llvm::SmallVector<ModuleInfo, 64> Imports;
for (const auto *I : Context.local_imports()) { for (const auto *I : Context.local_imports()) {
assert(SubmoduleIDs.find(I->getImportedModule()) != SubmoduleIDs.end()); assert(SubmoduleIDs.find(I->getImportedModule()) != SubmoduleIDs.end());
Imports.push_back({SubmoduleIDs[I->getImportedModule()], Imports.push_back(ModuleInfo(SubmoduleIDs[I->getImportedModule()],
I->getImportedModule()}); I->getImportedModule()));
} }
if (!Imports.empty()) { if (!Imports.empty()) {
@ -5309,7 +5314,7 @@ void ASTWriter::AddedCXXImplicitMember(const CXXRecordDecl *RD, const Decl *D) {
// A decl coming from PCH was modified. // A decl coming from PCH was modified.
assert(RD->isCompleteDefinition()); assert(RD->isCompleteDefinition());
DeclUpdates[RD].push_back({UPD_CXX_ADDED_IMPLICIT_MEMBER, D}); DeclUpdates[RD].push_back(DeclUpdate(UPD_CXX_ADDED_IMPLICIT_MEMBER, D));
} }
void ASTWriter::AddedCXXTemplateSpecialization(const ClassTemplateDecl *TD, void ASTWriter::AddedCXXTemplateSpecialization(const ClassTemplateDecl *TD,
@ -5320,7 +5325,8 @@ void ASTWriter::AddedCXXTemplateSpecialization(const ClassTemplateDecl *TD,
if (!(!D->isFromASTFile() && TD->isFromASTFile())) if (!(!D->isFromASTFile() && TD->isFromASTFile()))
return; // Not a source specialization added to a template from PCH. return; // Not a source specialization added to a template from PCH.
DeclUpdates[TD].push_back({UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION, D}); DeclUpdates[TD].push_back(DeclUpdate(UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION,
D));
} }
void ASTWriter::AddedCXXTemplateSpecialization( void ASTWriter::AddedCXXTemplateSpecialization(
@ -5331,7 +5337,8 @@ void ASTWriter::AddedCXXTemplateSpecialization(
if (!(!D->isFromASTFile() && TD->isFromASTFile())) if (!(!D->isFromASTFile() && TD->isFromASTFile()))
return; // Not a source specialization added to a template from PCH. return; // Not a source specialization added to a template from PCH.
DeclUpdates[TD].push_back({UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION, D}); DeclUpdates[TD].push_back(DeclUpdate(UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION,
D));
} }
void ASTWriter::AddedCXXTemplateSpecialization(const FunctionTemplateDecl *TD, void ASTWriter::AddedCXXTemplateSpecialization(const FunctionTemplateDecl *TD,
@ -5342,7 +5349,8 @@ void ASTWriter::AddedCXXTemplateSpecialization(const FunctionTemplateDecl *TD,
if (!(!D->isFromASTFile() && TD->isFromASTFile())) if (!(!D->isFromASTFile() && TD->isFromASTFile()))
return; // Not a source specialization added to a template from PCH. return; // Not a source specialization added to a template from PCH.
DeclUpdates[TD].push_back({UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION, D}); DeclUpdates[TD].push_back(DeclUpdate(UPD_CXX_ADDED_TEMPLATE_SPECIALIZATION,
D));
} }
void ASTWriter::ResolvedExceptionSpec(const FunctionDecl *FD) { void ASTWriter::ResolvedExceptionSpec(const FunctionDecl *FD) {
@ -5360,7 +5368,7 @@ void ASTWriter::DeducedReturnType(const FunctionDecl *FD, QualType ReturnType) {
if (!FD->isFromASTFile()) if (!FD->isFromASTFile())
return; // Not a function declared in PCH and defined outside. return; // Not a function declared in PCH and defined outside.
DeclUpdates[FD].push_back({UPD_CXX_DEDUCED_RETURN_TYPE, ReturnType}); DeclUpdates[FD].push_back(DeclUpdate(UPD_CXX_DEDUCED_RETURN_TYPE, ReturnType));
} }
void ASTWriter::CompletedImplicitDefinition(const FunctionDecl *D) { void ASTWriter::CompletedImplicitDefinition(const FunctionDecl *D) {
@ -5381,8 +5389,8 @@ void ASTWriter::StaticDataMemberInstantiated(const VarDecl *D) {
// Since the actual instantiation is delayed, this really means that we need // Since the actual instantiation is delayed, this really means that we need
// to update the instantiation location. // to update the instantiation location.
DeclUpdates[D].push_back( DeclUpdates[D].push_back(
{UPD_CXX_INSTANTIATED_STATIC_DATA_MEMBER, DeclUpdate(UPD_CXX_INSTANTIATED_STATIC_DATA_MEMBER,
D->getMemberSpecializationInfo()->getPointOfInstantiation()}); D->getMemberSpecializationInfo()->getPointOfInstantiation()));
} }
void ASTWriter::AddedObjCCategoryToInterface(const ObjCCategoryDecl *CatD, void ASTWriter::AddedObjCCategoryToInterface(const ObjCCategoryDecl *CatD,
@ -5416,5 +5424,5 @@ void ASTWriter::DeclarationMarkedUsed(const Decl *D) {
if (!D->isFromASTFile()) if (!D->isFromASTFile())
return; return;
DeclUpdates[D].push_back({UPD_DECL_MARKED_USED}); DeclUpdates[D].push_back(DeclUpdate(UPD_DECL_MARKED_USED));
} }

2
clang/lib/Serialization/ASTWriterDecl.cpp
View File

@ -896,7 +896,7 @@ void ASTDeclWriter::VisitNamespaceDecl(NamespaceDecl *D) {
D->getParent()->getRedeclContext()->getPrimaryContext()); D->getParent()->getRedeclContext()->getPrimaryContext());
if (Parent->isFromASTFile() || isa<TranslationUnitDecl>(Parent)) { if (Parent->isFromASTFile() || isa<TranslationUnitDecl>(Parent)) {
Writer.DeclUpdates[Parent].push_back( Writer.DeclUpdates[Parent].push_back(
{UPD_CXX_ADDED_ANONYMOUS_NAMESPACE, D}); ASTWriter::DeclUpdate(UPD_CXX_ADDED_ANONYMOUS_NAMESPACE, D));
} }
} }
} }