From 1a7ba62e3a99b7b0adcc41c7cceeb777e4e1e355 Mon Sep 17 00:00:00 2001 From: Douglas Gregor Date: Wed, 22 Jul 2009 22:05:02 +0000 Subject: [PATCH] Calls to Sema::MatchTemplateParametersToScopeSpecifier should not depend on the order of evaluation of their arguments to be correct. llvm-svn: 76804 --- clang/lib/Sema/SemaDecl.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 2db072561103..2e280f58cb5b 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -1854,7 +1854,7 @@ Sema::ActOnVariableDeclarator(Scope* S, Declarator& D, DeclContext* DC, = MatchTemplateParametersToScopeSpecifier( D.getDeclSpec().getSourceRange().getBegin(), D.getCXXScopeSpec(), - (TemplateParameterList**)TemplateParamLists.release(), + (TemplateParameterList**)TemplateParamLists.get(), TemplateParamLists.size())) { if (TemplateParams->size() > 0) { // There is no such thing as a variable template. @@ -2229,7 +2229,7 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, = MatchTemplateParametersToScopeSpecifier( D.getDeclSpec().getSourceRange().getBegin(), D.getCXXScopeSpec(), - (TemplateParameterList**)TemplateParamLists.release(), + (TemplateParameterList**)TemplateParamLists.get(), TemplateParamLists.size())) { if (TemplateParams->size() > 0) { // This is a function template @@ -2241,6 +2241,9 @@ Sema::ActOnFunctionDeclarator(Scope* S, Declarator& D, DeclContext* DC, } else { // FIXME: Handle function template specializations } + + // FIXME: Free this memory properly. + TemplateParamLists.release(); } // C++ [dcl.fct.spec]p5: