diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-14 23:13:10 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-14 23:13:10 +0000 |
| commit | 4b38ded66a5556117245b5db76e2c27363a85305 (patch) | |
| tree | 6a28a6162ff4b3e80e9f7bb9cc50835fc8d1a779 /clang/lib/Serialization/ASTReaderDecl.cpp | |
| parent | be84d8590523a3c7b79c248ce3ad2933191deb5a (diff) | |
| download | bcm5719-llvm-4b38ded66a5556117245b5db76e2c27363a85305.tar.gz bcm5719-llvm-4b38ded66a5556117245b5db76e2c27363a85305.zip | |
Instantiating a class template should not instantiate the definition of any
scoped enumeration members. Later uses of an enumeration temploid as a nested
name specifier should cause its instantiation. Plus some groundwork for
explicit specialization of member enumerations of class templates.
llvm-svn: 152750
Diffstat (limited to 'clang/lib/Serialization/ASTReaderDecl.cpp')
| -rw-r--r-- | clang/lib/Serialization/ASTReaderDecl.cpp | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/clang/lib/Serialization/ASTReaderDecl.cpp b/clang/lib/Serialization/ASTReaderDecl.cpp index 8a65538fce2..5db5f9252b7 100644 --- a/clang/lib/Serialization/ASTReaderDecl.cpp +++ b/clang/lib/Serialization/ASTReaderDecl.cpp @@ -453,7 +453,13 @@ void ASTDeclReader::VisitEnumDecl(EnumDecl *ED) { ED->IsScoped = Record[Idx++]; ED->IsScopedUsingClassTag = Record[Idx++]; ED->IsFixed = Record[Idx++]; - ED->setInstantiationOfMemberEnum(ReadDeclAs<EnumDecl>(Record, Idx)); + + if (EnumDecl *InstED = ReadDeclAs<EnumDecl>(Record, Idx)) { + TemplateSpecializationKind TSK = (TemplateSpecializationKind)Record[Idx++]; + SourceLocation POI = ReadSourceLocation(Record, Idx); + ED->setInstantiationOfMemberEnum(Reader.getContext(), InstED, TSK); + ED->getMemberSpecializationInfo()->setPointOfInstantiation(POI); + } } void ASTDeclReader::VisitRecordDecl(RecordDecl *RD) { |
