From bc7f8367e608243c4040bb857ccff0d5380ddb3d Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 18 Feb 2014 20:31:51 +0000 Subject: Clang/LLVM 3.4 compatibility for the LLDB snapshot Revert commits that tracked Clang/LLVM API changes after the 3.4 branch point: Git SVN 3ad0a1a 199408 05be72c 199689 9ad47a9 200085 --- .../lldb/source/Expression/ClangASTSource.cpp | 4 ++-- .../llvm/tools/lldb/source/Symbol/ClangASTType.cpp | 28 +++++++++++----------- 2 files changed, 16 insertions(+), 16 deletions(-) (limited to 'contrib') diff --git a/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp b/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp index 853d102c5426..23bca548c2ec 100644 --- a/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp +++ b/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp @@ -1778,14 +1778,14 @@ NameSearchContext::AddFunDecl (const ClangASTType &type) if (func_proto_type) { - unsigned NumArgs = func_proto_type->getNumParams(); + unsigned NumArgs = func_proto_type->getNumArgs(); unsigned ArgIndex; SmallVector parm_var_decls; for (ArgIndex = 0; ArgIndex < NumArgs; ++ArgIndex) { - QualType arg_qual_type (func_proto_type->getParamType(ArgIndex)); + QualType arg_qual_type (func_proto_type->getArgType(ArgIndex)); parm_var_decls.push_back(ParmVarDecl::Create (*ast, const_cast(m_decl_context), diff --git a/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp b/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp index 40f6462ee360..a407801e6a52 100644 --- a/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp +++ b/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp @@ -414,7 +414,7 @@ ClangASTType::GetNumberOfFunctionArguments () const QualType qual_type (GetCanonicalQualType()); const FunctionProtoType* func = dyn_cast(qual_type.getTypePtr()); if (func) - return func->getNumParams(); + return func->getNumArgs(); } return 0; } @@ -428,8 +428,8 @@ ClangASTType::GetFunctionArgumentAtIndex (const size_t index) const FunctionProtoType* func = dyn_cast(qual_type.getTypePtr()); if (func) { - if (index < func->getNumParams()) - return ClangASTType(m_ast, func->getParamType(index).getAsOpaquePtr()); + if (index < func->getNumArgs()) + return ClangASTType(m_ast, func->getArgType(index).getAsOpaquePtr()); } } return ClangASTType(); @@ -1596,7 +1596,7 @@ ClangASTType::GetFunctionArgumentCount () const { const FunctionProtoType* func = dyn_cast(GetCanonicalQualType()); if (func) - return func->getNumParams(); + return func->getNumArgs(); } return -1; } @@ -1609,9 +1609,9 @@ ClangASTType::GetFunctionArgumentTypeAtIndex (size_t idx) const FunctionProtoType* func = dyn_cast(GetCanonicalQualType()); if (func) { - const uint32_t num_args = func->getNumParams(); + const uint32_t num_args = func->getNumArgs(); if (idx < num_args) - return ClangASTType(m_ast, func->getParamType(idx)); + return ClangASTType(m_ast, func->getArgType(idx)); } } return ClangASTType(); @@ -1625,7 +1625,7 @@ ClangASTType::GetFunctionReturnType () const QualType qual_type(GetCanonicalQualType()); const FunctionProtoType* func = dyn_cast(qual_type.getTypePtr()); if (func) - return ClangASTType(m_ast, func->getReturnType()); + return ClangASTType(m_ast, func->getResultType()); } return ClangASTType(); } @@ -4648,7 +4648,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name, if (!method_function_prototype) return NULL; - unsigned int num_params = method_function_prototype->getNumParams(); + unsigned int num_params = method_function_prototype->getNumArgs(); CXXDestructorDecl *cxx_dtor_decl(NULL); CXXConstructorDecl *cxx_ctor_decl(NULL); @@ -4715,7 +4715,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name, cxx_method_decl = CXXConversionDecl::Create (*m_ast, cxx_record_decl, SourceLocation(), - DeclarationNameInfo (m_ast->DeclarationNames.getCXXConversionFunctionName (m_ast->getCanonicalType (function_type->getReturnType())), SourceLocation()), + DeclarationNameInfo (m_ast->DeclarationNames.getCXXConversionFunctionName (m_ast->getCanonicalType (function_type->getResultType())), SourceLocation()), method_qual_type, NULL, // TypeSourceInfo * is_inline, @@ -4746,7 +4746,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name, cxx_method_decl->setVirtualAsWritten (is_virtual); if (is_attr_used) - cxx_method_decl->addAttr(clang::UsedAttr::CreateImplicit(*m_ast)); + cxx_method_decl->addAttr(::new (*m_ast) UsedAttr(SourceRange(), *m_ast)); // Populate the method decl with parameter decls @@ -4761,7 +4761,7 @@ ClangASTType::AddMethodToCXXRecordType (const char *name, SourceLocation(), SourceLocation(), NULL, // anonymous - method_function_prototype->getParamType(param_index), + method_function_prototype->getArgType(param_index), NULL, SC_None, NULL)); @@ -5134,7 +5134,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->getNumParams(); + const unsigned num_args = method_function_prototype->getNumArgs(); if (num_args != num_selectors_with_args) return NULL; // some debug information is corrupt. We are not going to deal with it. @@ -5143,7 +5143,7 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n SourceLocation(), // beginLoc, SourceLocation(), // endLoc, method_selector, - method_function_prototype->getReturnType(), + method_function_prototype->getResultType(), NULL, // TypeSourceInfo *ResultTInfo, GetDeclContextForType (), name[0] == '-', @@ -5169,7 +5169,7 @@ ClangASTType::AddMethodToObjCObjectType (const char *name, // the full symbol n SourceLocation(), SourceLocation(), NULL, // anonymous - method_function_prototype->getParamType(param_index), + method_function_prototype->getArgType(param_index), NULL, SC_Auto, NULL)); -- cgit v1.2.3