diff options
| -rw-r--r-- | include/clang/AST/Decl.h | 5 | ||||
| -rw-r--r-- | lib/AST/Decl.cpp | 13 |
2 files changed, 13 insertions, 5 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index 1d2c39e18a..901da704ce 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -643,6 +643,11 @@ public: unsigned getBuiltinID(ASTContext &Context) const; + /// getNumParmVarDeclsFromType - Ignoring the actual argument list, this + /// returns the number of ParmVarDecls that the FunctionType of this function + /// expects. + unsigned getNumParmVarDeclsFromType() const; + // Iterator access to formal parameters. unsigned param_size() const { return getNumParams(); } typedef ParmVarDecl **param_iterator; diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 0326b34960..a715531c74 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -431,12 +431,15 @@ unsigned FunctionDecl::getBuiltinID(ASTContext &Context) const { } -// Helper function for FunctionDecl::getNumParams and FunctionDecl::setParams() -static unsigned getNumTypeParams(QualType T) { - const FunctionType *FT = T->getAsFunctionType(); +/// getNumParmVarDeclsFromType - Ignoring the actual argument list, this +/// returns the number of ParmVarDecls that the FunctionType of this function +/// expects. +unsigned FunctionDecl::getNumParmVarDeclsFromType() const { + const FunctionType *FT = getType()->getAsFunctionType(); if (isa<FunctionNoProtoType>(FT)) return 0; return cast<FunctionProtoType>(FT)->getNumArgs(); + } unsigned FunctionDecl::getNumParams() const { @@ -444,13 +447,13 @@ unsigned FunctionDecl::getNumParams() const { if (!ParamInfo) return 0; - return getNumTypeParams(getType()); + return getNumParmVarDeclsFromType(); } void FunctionDecl::setParams(ASTContext& C, ParmVarDecl **NewParamInfo, unsigned NumParams) { assert(ParamInfo == 0 && "Already has param info!"); - assert(NumParams == getNumTypeParams(getType()) && + assert(NumParams == getNumParmVarDeclsFromType() && "Parameter count mismatch!"); // Zero params -> null pointer. |