diff options
| -rw-r--r-- | clang/include/clang/Serialization/ASTWriter.h | 4 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTCommon.h | 4 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTReaderDecl.cpp | 8 | ||||
| -rw-r--r-- | clang/lib/Serialization/ASTWriter.cpp | 21 | ||||
| -rw-r--r-- | clang/test/PCH/cxx-mangling.cpp | 28 |
5 files changed, 61 insertions, 4 deletions
diff --git a/clang/include/clang/Serialization/ASTWriter.h b/clang/include/clang/Serialization/ASTWriter.h index 68c92930e9b..91afeabfa1c 100644 --- a/clang/include/clang/Serialization/ASTWriter.h +++ b/clang/include/clang/Serialization/ASTWriter.h @@ -291,6 +291,7 @@ private: const Decl *Dcl; void *Type; unsigned Loc; + unsigned Val; }; public: @@ -300,6 +301,8 @@ private: : Kind(Kind), Type(Type.getAsOpaquePtr()) {} DeclUpdate(unsigned Kind, SourceLocation Loc) : Kind(Kind), Loc(Loc.getRawEncoding()) {} + DeclUpdate(unsigned Kind, unsigned Val) + : Kind(Kind), Val(Val) {} unsigned getKind() const { return Kind; } const Decl *getDecl() const { return Dcl; } @@ -307,6 +310,7 @@ private: SourceLocation getLoc() const { return SourceLocation::getFromRawEncoding(Loc); } + unsigned getNumber() const { return Val; } }; typedef SmallVector<DeclUpdate, 1> UpdateRecord; diff --git a/clang/lib/Serialization/ASTCommon.h b/clang/lib/Serialization/ASTCommon.h index b6f54a472ee..9f4d7a9acdd 100644 --- a/clang/lib/Serialization/ASTCommon.h +++ b/clang/lib/Serialization/ASTCommon.h @@ -28,7 +28,9 @@ enum DeclUpdateKind { UPD_CXX_INSTANTIATED_STATIC_DATA_MEMBER, UPD_CXX_RESOLVED_EXCEPTION_SPEC, UPD_CXX_DEDUCED_RETURN_TYPE, - UPD_DECL_MARKED_USED + UPD_DECL_MARKED_USED, + UPD_MANGLING_NUMBER, + UPD_STATIC_LOCAL_NUMBER }; TypeIdx TypeIdxFromBuiltin(const BuiltinType *BT); diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 53c26e94e1f..c186ba00ee5 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -2968,6 +2968,14 @@ void ASTDeclReader::UpdateDecl(Decl *D, ModuleFile &ModuleFile, D->Used = true; break; } + + case UPD_MANGLING_NUMBER: + Reader.Context.setManglingNumber(cast<NamedDecl>(D), Record[Idx++]); + break; + + case UPD_STATIC_LOCAL_NUMBER: + Reader.Context.setStaticLocalNumber(cast<VarDecl>(D), Record[Idx++]); + break; } } } diff --git a/clang/lib/Serialization/ASTWriter.cpp b/clang/lib/Serialization/ASTWriter.cpp index 55dd375dc1f..1399ce2434c 100644 --- a/clang/lib/Serialization/ASTWriter.cpp +++ b/clang/lib/Serialization/ASTWriter.cpp @@ -4085,6 +4085,17 @@ void ASTWriter::WriteASTCore(Sema &SemaRef, Record.push_back({UPD_CXX_ADDED_ANONYMOUS_NAMESPACE, NS}); } + // Add update records for all mangling numbers and static local numbers. + // These aren't really update records, but this is a convenient way of + // tagging this rare extra data onto the declarations. + for (const auto &Number : Context.MangleNumbers) + if (!Number.first->isFromASTFile()) + DeclUpdates[Number.first].push_back({UPD_MANGLING_NUMBER, Number.second}); + for (const auto &Number : Context.StaticLocalNumbers) + if (!Number.first->isFromASTFile()) + DeclUpdates[Number.first].push_back({UPD_STATIC_LOCAL_NUMBER, + Number.second}); + // Make sure visible decls, added to DeclContexts previously loaded from // an AST file, are registered for serialization. for (SmallVectorImpl<const Decl *>::iterator @@ -4187,13 +4198,12 @@ void ASTWriter::WriteASTCore(Sema &SemaRef, } while (!DeclUpdates.empty()); Stream.ExitBlock(); - if (!DeclUpdatesOffsetsRecord.empty()) - Stream.EmitRecord(DECL_UPDATE_OFFSETS, DeclUpdatesOffsetsRecord); - DoneWritingDeclsAndTypes = true; // These things can only be done once we've written out decls and types. WriteTypeDeclOffsets(); + if (!DeclUpdatesOffsetsRecord.empty()) + Stream.EmitRecord(DECL_UPDATE_OFFSETS, DeclUpdatesOffsetsRecord); WriteCXXBaseSpecifiersOffsets(); WriteFileDeclIDsMap(); WriteSourceManagerBlock(Context.getSourceManager(), PP, isysroot); @@ -4372,6 +4382,11 @@ void ASTWriter::WriteDeclUpdatesBlocks(RecordDataImpl &OffsetsRecord) { case UPD_DECL_MARKED_USED: break; + + case UPD_MANGLING_NUMBER: + case UPD_STATIC_LOCAL_NUMBER: + Record.push_back(Update.getNumber()); + break; } } diff --git a/clang/test/PCH/cxx-mangling.cpp b/clang/test/PCH/cxx-mangling.cpp new file mode 100644 index 00000000000..d086f26465a --- /dev/null +++ b/clang/test/PCH/cxx-mangling.cpp @@ -0,0 +1,28 @@ +// Test without PCH. +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -include %s %s -emit-llvm -o - | FileCheck %s +// +// Test with PCH. +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -x c++-header %s -emit-pch -o %t +// RUN: %clang_cc1 -std=c++11 -triple %itanium_abi_triple -fcxx-exceptions -fexceptions -include-pch %t %s -emit-llvm -o - | FileCheck %s + +#ifndef HEADER +#define HEADER + +struct A { + struct { int a; } a; + struct { int b; } b; +}; + +#else + +template<typename T> void f(T) {} + +// CHECK-LABEL: define void @_Z1g1A( +void g(A a) { + // CHECK: call void @_Z1fIN1AUt0_EEvT_( + f(a.b); + // CHECK: call void @_Z1fIN1AUt_EEvT_( + f(a.a); +} + +#endif |
