Author: majnemer Date: Sat Sep 14 00:46:42 2013 New Revision: 190743 URL: http://llvm.org/viewvc/llvm-project?rev=190743&view=rev Log: Parse: Template specializations which aren't dependent needn't have their parsing be delayed
Summary: We should treat a non-dependent template specialization like it wasn't templated at all. Reviewers: rsmith CC: cfe-commits Differential Revision: http://llvm-reviews.chandlerc.com/D1554 Added: cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp Modified: cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp Modified: cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp?rev=190743&r1=190742&r2=190743&view=diff ============================================================================== --- cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp (original) +++ cfe/trunk/lib/Parse/ParseCXXInlineMethods.cpp Sat Sep 14 00:46:42 2013 @@ -113,11 +113,12 @@ NamedDecl *Parser::ParseCXXInlineMethodD // In delayed template parsing mode, if we are within a class template // or if we are about to parse function member template then consume // the tokens and store them for parsing at the end of the translation unit. - if (getLangOpts().DelayedTemplateParsing && - DefinitionKind == FDK_Definition && + if (getLangOpts().DelayedTemplateParsing && + DefinitionKind == FDK_Definition && ((Actions.CurContext->isDependentContext() || - TemplateInfo.Kind != ParsedTemplateInfo::NonTemplate) && - !Actions.IsInsideALocalClassWithinATemplateFunction())) { + (TemplateInfo.Kind != ParsedTemplateInfo::NonTemplate && + TemplateInfo.Kind != ParsedTemplateInfo::ExplicitSpecialization)) && + !Actions.IsInsideALocalClassWithinATemplateFunction())) { CachedTokens Toks; LexTemplateFunctionForLateParsing(Toks); Added: cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp?rev=190743&view=auto ============================================================================== --- cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp (added) +++ cfe/trunk/test/CodeGenCXX/delayed-template-parsing.cpp Sat Sep 14 00:46:42 2013 @@ -0,0 +1,18 @@ +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -fms-extensions -fdelayed-template-parsing -triple=i386-pc-win32 | FileCheck %s +// RUN: %clang_cc1 -std=c++11 -emit-llvm %s -o - -cxx-abi microsoft -fms-extensions -fdelayed-template-parsing -triple=x86_64-pc-win32 | FileCheck -check-prefix X64 %s + +namespace ClassScopeSpecialization { + struct Type { + template <int i> + void Foo() {} + template <> + void Foo<0>() {} + }; + + void call() { + Type T; +// CHECK: call {{.*}} @"\01??$Foo@$0A@@Type@ClassScopeSpecialization@@QAEXXZ" +// X64: call {{.*}} @"\01??$Foo@$0A@@Type@ClassScopeSpecialization@@QEAAXXZ" + T.Foo<0>(); + } +} _______________________________________________ cfe-commits mailing list [email protected] http://lists.cs.uiuc.edu/mailman/listinfo/cfe-commits
