Build fix following clang r199686

llvm-svn: 199689
This commit is contained in:
Alp Toker 2014-01-20 21:14:57 +00:00
parent d19f80a0b4
commit f747ff1f54
2 changed files with 12 additions and 12 deletions

View File

@ -1775,14 +1775,14 @@ NameSearchContext::AddFunDecl (const ClangASTType &type)
if (func_proto_type)
{
unsigned NumArgs = func_proto_type->getNumArgs();
unsigned NumArgs = func_proto_type->getNumParams();
unsigned ArgIndex;
SmallVector<ParmVarDecl *, 5> parm_var_decls;
for (ArgIndex = 0; ArgIndex < NumArgs; ++ArgIndex)
{
QualType arg_qual_type (func_proto_type->getArgType(ArgIndex));
QualType arg_qual_type (func_proto_type->getParamType(ArgIndex));
parm_var_decls.push_back(ParmVarDecl::Create (*ast,
const_cast<DeclContext*>(m_decl_context),

View File

@ -413,7 +413,7 @@ ClangASTType::GetNumberOfFunctionArguments () const
QualType qual_type (GetCanonicalQualType());
const FunctionProtoType* func = dyn_cast<FunctionProtoType>(qual_type.getTypePtr());
if (func)
return func->getNumArgs();
return func->getNumParams();
}
return 0;
}
@ -427,8 +427,8 @@ ClangASTType::GetFunctionArgumentAtIndex (const size_t index)
const FunctionProtoType* func = dyn_cast<FunctionProtoType>(qual_type.getTypePtr());
if (func)
{
if (index < func->getNumArgs())
return ClangASTType(m_ast, func->getArgType(index).getAsOpaquePtr());
if (index < func->getNumParams())
return ClangASTType(m_ast, func->getParamType(index).getAsOpaquePtr());
}
}
return ClangASTType();
@ -1595,7 +1595,7 @@ ClangASTType::GetFunctionArgumentCount () const
{
const FunctionProtoType* func = dyn_cast<FunctionProtoType>(GetCanonicalQualType());
if (func)
return func->getNumArgs();
return func->getNumParams();
}
return -1;
}
@ -1608,9 +1608,9 @@ ClangASTType::GetFunctionArgumentTypeAtIndex (size_t idx)
const FunctionProtoType* func = dyn_cast<FunctionProtoType>(GetCanonicalQualType());
if (func)
{
const uint32_t num_args = func->getNumArgs();
const uint32_t num_args = func->getNumParams();
if (idx < num_args)
return ClangASTType(m_ast, func->getArgType(idx));
return ClangASTType(m_ast, func->getParamType(idx));
}
}
return ClangASTType();
@ -4647,7 +4647,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
if (!method_function_prototype)
return NULL;
unsigned int num_params = method_function_prototype->getNumArgs();
unsigned int num_params = method_function_prototype->getNumParams();
CXXDestructorDecl *cxx_dtor_decl(NULL);
CXXConstructorDecl *cxx_ctor_decl(NULL);
@ -4760,7 +4760,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name,
SourceLocation(),
SourceLocation(),
NULL, // anonymous
method_function_prototype->getArgType(param_index),
method_function_prototype->getParamType(param_index),
NULL,
SC_None,
NULL));
@ -5133,7 +5133,7 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
bool is_defined = false;
ObjCMethodDecl::ImplementationControl imp_control = ObjCMethodDecl::None;
const unsigned num_args = method_function_prototype->getNumArgs();
const unsigned num_args = method_function_prototype->getNumParams();
if (num_args != num_selectors_with_args)
return NULL; // some debug information is corrupt. We are not going to deal with it.
@ -5168,7 +5168,7 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n
SourceLocation(),
SourceLocation(),
NULL, // anonymous
method_function_prototype->getArgType(param_index),
method_function_prototype->getParamType(param_index),
NULL,
SC_Auto,
NULL));