Fix an embarrassing think in the disambiguation logic for the ellipsis in a parameter...

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@122924 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Parse/ParseDecl.cpp b/lib/Parse/ParseDecl.cpp
index ab9173ffab0bd96add4f1ce4f1a48473a800d915..8e334c3069742e3cf89092ac79229ae1a4fb01bc 100644 (file)
--- a/lib/Parse/ParseDecl.cpp
+++ b/lib/Parse/ParseDecl.cpp
@@ -2831,7 +2831,6 @@ void Parser::ParseDirectDeclarator(Declarator &D) {
     if (Tok.is(tok::ellipsis) &&
         !((D.getContext() == Declarator::PrototypeContext ||
            D.getContext() == Declarator::BlockLiteralContext) &&
-          getCurScope()->getTemplateParamParent() &&
           NextToken().is(tok::r_paren) &&
           !Actions.containsUnexpandedParameterPacks(D)))
       D.setEllipsisLoc(ConsumeToken());