diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-23 23:09:08 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-03-23 23:09:08 +0000 |
commit | b66d77793f2582901e6dde2015a6f3a8fac167b7 (patch) | |
tree | d1fb7cb0eed55e3afa7727426cc428fb8c60417a /clang/lib/Sema/SemaTemplateInstantiate.cpp | |
parent | 6976ec85510ffa9e35b7cf03a79d1c394a1b3080 (diff) | |
download | bcm5719-llvm-b66d77793f2582901e6dde2015a6f3a8fac167b7.tar.gz bcm5719-llvm-b66d77793f2582901e6dde2015a6f3a8fac167b7.zip |
When defining a forward-declared enum, don't try to attach the definition to
a previous declaration if the redeclaration is invalid. That way lies madness.
Fixes a crash-on-invalid reported by Abramo.
llvm-svn: 153349
Diffstat (limited to 'clang/lib/Sema/SemaTemplateInstantiate.cpp')
-rw-r--r-- | clang/lib/Sema/SemaTemplateInstantiate.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaTemplateInstantiate.cpp b/clang/lib/Sema/SemaTemplateInstantiate.cpp index afa65ea9ee4..307cccce8bc 100644 --- a/clang/lib/Sema/SemaTemplateInstantiate.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiate.cpp @@ -1848,7 +1848,8 @@ Sema::InstantiateClass(SourceLocation PointOfInstantiation, // specialization causes the implicit instantiation of the definitions // of unscoped member enumerations. // Record a point of instantiation for this implicit instantiation. - if (TSK == TSK_ImplicitInstantiation && !Enum->isScoped()) { + if (TSK == TSK_ImplicitInstantiation && !Enum->isScoped() && + Enum->isCompleteDefinition()) { MemberSpecializationInfo *MSInfo =Enum->getMemberSpecializationInfo(); assert(MSInfo && "no spec info for member enum specialization"); MSInfo->setTemplateSpecializationKind(TSK_ImplicitInstantiation); |