diff options
| -rw-r--r-- | include/clang/Parse/DeclSpec.h | 10 | ||||
| -rw-r--r-- | lib/Sema/SemaDeclCXX.cpp | 14 |
2 files changed, 12 insertions, 12 deletions
diff --git a/include/clang/Parse/DeclSpec.h b/include/clang/Parse/DeclSpec.h index c351e30bf2..d4ac25a250 100644 --- a/include/clang/Parse/DeclSpec.h +++ b/include/clang/Parse/DeclSpec.h @@ -521,6 +521,16 @@ struct DeclaratorChunk { /// there are no arguments specified. ParamInfo *ArgInfo; + /// freeArgs - reset the argument list to having zero arguments. This is + /// used in various places for error recovery. + void freeArgs() { + if (DeleteArgInfo) { + delete[] ArgInfo; + DeleteArgInfo = false; + } + NumArgs = 0; + } + void destroy() { if (DeleteArgInfo) delete[] ArgInfo; diff --git a/lib/Sema/SemaDeclCXX.cpp b/lib/Sema/SemaDeclCXX.cpp index a582540859..d5d83be87d 100644 --- a/lib/Sema/SemaDeclCXX.cpp +++ b/lib/Sema/SemaDeclCXX.cpp @@ -1202,12 +1202,7 @@ bool Sema::CheckDestructorDeclarator(Declarator &D, QualType &R, 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 @@ bool Sema::CheckConversionDeclarator(Declarator &D, QualType &R, 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. |