diff options
author | David Majnemer <david.majnemer@gmail.com> | 2013-10-23 21:31:20 +0000 |
---|---|---|
committer | David Majnemer <david.majnemer@gmail.com> | 2013-10-23 21:31:20 +0000 |
commit | 645526c3e42170e356f792b1bc0ac2acb65c26c4 (patch) | |
tree | 36c76ceb92c36b5d434705aba4969859c28581c9 /lib/Parse/ParseCXXInlineMethods.cpp | |
parent | 885d8bf8d06ddaf79ffe45a96aaa42621db44241 (diff) |
Parse: Disable delayed template parsing for constexpr functions
Commit r191484 treated constexpr function templates as normal function
templates with respect to delaying their parsing. However, this is
unnecessarily restrictive because there is no compatibility concern with
constexpr, MSVC doesn't support it.
Instead, simply disable delayed template parsing for constexpr function
templates. This largely reverts the changes made in r191484 but keeps
it's unit test.
This fixes PR17661.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@193274 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Parse/ParseCXXInlineMethods.cpp')
-rw-r--r-- | lib/Parse/ParseCXXInlineMethods.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/Parse/ParseCXXInlineMethods.cpp b/lib/Parse/ParseCXXInlineMethods.cpp index 6bab7988cf..863a09e89d 100644 --- a/lib/Parse/ParseCXXInlineMethods.cpp +++ b/lib/Parse/ParseCXXInlineMethods.cpp @@ -115,6 +115,7 @@ NamedDecl *Parser::ParseCXXInlineMethodDef(AccessSpecifier AS, // the tokens and store them for parsing at the end of the translation unit. if (getLangOpts().DelayedTemplateParsing && DefinitionKind == FDK_Definition && + !D.getDeclSpec().isConstexprSpecified() && ((Actions.CurContext->isDependentContext() || (TemplateInfo.Kind != ParsedTemplateInfo::NonTemplate && TemplateInfo.Kind != ParsedTemplateInfo::ExplicitSpecialization)) && |