commit 78c665b4e776722b687ab69ca933901689e2275e
author Douglas Gregor <doug.gregor@gmail.com> Wed Jul 22 22:05:02 2009 +0000
committer Douglas Gregor <doug.gregor@gmail.com> Wed Jul 22 22:05:02 2009 +0000
tree 541b7ec1d58eb2bf277b31c6d070c92efb83c867
parent 1e7aa5dc080d033b963fd4fa39944da93fe5bc89

Calls to Sema::MatchTemplateParametersToScopeSpecifier should not depend on the order of evaluation of their arguments to be correct.

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

lib/Sema/SemaDecl.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 2db0725..2e280f5 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -1854,7 +1854,7 @@
       = 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 @@
         = 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 @@
     } else {
       // FIXME: Handle function template specializations
     }
+          
+    // FIXME: Free this memory properly.
+    TemplateParamLists.release();
   }        
   
   // C++ [dcl.fct.spec]p5: