commit 5742c1edc44e2bbf1259d27bf0231b151276aa16
author Chris Lattner <sabre@nondot.org> Tue Jan 20 21:06:38 2009 +0000
committer Chris Lattner <sabre@nondot.org> Tue Jan 20 21:06:38 2009 +0000
tree e9f73a7602ab7cfa3c0c699f63c54b73b9a23e43
parent e5564628b467ecb7a717519e94f97a1d2ec5729a

Fix a crash Anders' was seeing due to free'ing an invalid pointer
caused by my previous commit.

llvm-svn: 62613

clang/lib/Sema/SemaDeclCXX.cpp

diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index a582540..d5d83be 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -1202,12 +1202,7 @@
     Diag(D.getIdentifierLoc(), diag::err_destructor_with_params);
 
     // Delete the parameters.
-    DeclaratorChunk::FunctionTypeInfo &FTI = D.getTypeObject(0).Fun;
-    if (FTI.NumArgs) {
-      delete [] FTI.ArgInfo;
-      FTI.NumArgs = 0;
-      FTI.ArgInfo = 0;
-    }
+    D.getTypeObject(0).Fun.freeArgs();
   }
 
   // Make sure the destructor isn't variadic.  
@@ -1264,12 +1259,7 @@
     Diag(D.getIdentifierLoc(), diag::err_conv_function_with_params);
 
     // Delete the parameters.
-    DeclaratorChunk::FunctionTypeInfo &FTI = D.getTypeObject(0).Fun;
-    if (FTI.NumArgs) {
-      delete [] FTI.ArgInfo;
-      FTI.NumArgs = 0;
-      FTI.ArgInfo = 0;
-    }
+    D.getTypeObject(0).Fun.freeArgs();
   }
 
   // Make sure the conversion function isn't variadic.