Author: majnemer
Date: Fri Jan 9 00:10:21 2015
New Revision: 225508
URL: http://llvm.org/viewvc/llvm-project?rev=225508&view=rev
Log:
Sema: Don't crash when specializing a global scope function in a class
We assumed that class-scope specializations would result in a
CXXMethodDecl for that class. However, globally qualified functions
will result in normal FunctionDecls.
Modified:
cfe/trunk/lib/Sema/SemaDecl.cpp
cfe/trunk/test/SemaTemplate/instantiate-method.cpp
Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=225508&r1=225507&r2=225508&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Fri Jan 9 00:10:21 2015
@@ -7482,7 +7482,7 @@ Sema::ActOnFunctionDeclarator(Scope *S,
} else if (isFunctionTemplateSpecialization) {
if (CurContext->isDependentContext() && CurContext->isRecord()
&& !isFriend) {
- isDependentClassScopeExplicitSpecialization = true;
+ isDependentClassScopeExplicitSpecialization =
isa<CXXMethodDecl>(NewFD);
Diag(NewFD->getLocation(), getLangOpts().MicrosoftExt ?
diag::ext_function_specialization_in_class :
diag::err_function_specialization_in_class)
Modified: cfe/trunk/test/SemaTemplate/instantiate-method.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/instantiate-method.cpp?rev=225508&r1=225507&r2=225508&view=diff
==============================================================================
--- cfe/trunk/test/SemaTemplate/instantiate-method.cpp (original)
+++ cfe/trunk/test/SemaTemplate/instantiate-method.cpp Fri Jan 9 00:10:21 2015
@@ -195,3 +195,9 @@ namespace PR22040 {
Foobar<int>::bazqux(3); // expected-error{{no member named 'bazqux' in }}
}
}
+
+template <typename>
+struct SpecializationOfGlobalFnInClassScope {
+ template <>
+ void ::Fn(); // expected-error{{cannot have a qualified name}}
expected-error{{cannot specialize a function}}
+};
_______________________________________________
cfe-commits mailing list
[email protected]
http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
