svn commit: r275125 - in projects/clang350-import/contrib/llvm/tools/lldb/source: Expression Symbol
Ed Maste
emaste at FreeBSD.org
Wed Nov 26 16:23:33 UTC 2014
Author: emaste
Date: Wed Nov 26 16:23:32 2014
New Revision: 275125
URL: https://svnweb.freebsd.org/changeset/base/275125
Log:
Revert Clang 3.4 API compatibility changes
Re-apply previously reverted changes to restore LLDB to parity with
the last update as of upstream revision 202189. This is the first step
an LLDB update to correspond with the Clang 3.5 import and re-applies
the following upstream revisions:
SVN git
199408 3ad0a1a1
199689 05be72c3
200085 9ad47a93
Sponsored by: DARPA, AFRL
Modified:
projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp
projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp
==============================================================================
--- projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp Wed Nov 26 16:05:01 2014 (r275124)
+++ projects/clang350-import/contrib/llvm/tools/lldb/source/Expression/ClangASTSource.cpp Wed Nov 26 16:23:32 2014 (r275125)
@@ -1778,14 +1778,14 @@ NameSearchContext::AddFunDecl (const Cla
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),
Modified: projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp
==============================================================================
--- projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 16:05:01 2014 (r275124)
+++ projects/clang350-import/contrib/llvm/tools/lldb/source/Symbol/ClangASTType.cpp Wed Nov 26 16:23:32 2014 (r275125)
@@ -414,7 +414,7 @@ ClangASTType::GetNumberOfFunctionArgumen
QualType qual_type (GetCanonicalQualType());
const FunctionProtoType* func = dyn_cast<FunctionProtoType>(qual_type.getTypePtr());
if (func)
- return func->getNumArgs();
+ return func->getNumParams();
}
return 0;
}
@@ -428,8 +428,8 @@ ClangASTType::GetFunctionArgumentAtIndex
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();
@@ -1596,7 +1596,7 @@ ClangASTType::GetFunctionArgumentCount (
{
const FunctionProtoType* func = dyn_cast<FunctionProtoType>(GetCanonicalQualType());
if (func)
- return func->getNumArgs();
+ return func->getNumParams();
}
return -1;
}
@@ -1609,9 +1609,9 @@ ClangASTType::GetFunctionArgumentTypeAtI
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();
@@ -1625,7 +1625,7 @@ ClangASTType::GetFunctionReturnType () c
QualType qual_type(GetCanonicalQualType());
const FunctionProtoType* func = dyn_cast<FunctionProtoType>(qual_type.getTypePtr());
if (func)
- return ClangASTType(m_ast, func->getResultType());
+ return ClangASTType(m_ast, func->getReturnType());
}
return ClangASTType();
}
@@ -4648,7 +4648,7 @@ ClangASTType::AddMethodToCXXRecordType (
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);
@@ -4715,7 +4715,7 @@ ClangASTType::AddMethodToCXXRecordType (
cxx_method_decl = CXXConversionDecl::Create (*m_ast,
cxx_record_decl,
SourceLocation(),
- DeclarationNameInfo (m_ast->DeclarationNames.getCXXConversionFunctionName (m_ast->getCanonicalType (function_type->getResultType())), SourceLocation()),
+ DeclarationNameInfo (m_ast->DeclarationNames.getCXXConversionFunctionName (m_ast->getCanonicalType (function_type->getReturnType())), SourceLocation()),
method_qual_type,
NULL, // TypeSourceInfo *
is_inline,
@@ -4746,7 +4746,7 @@ ClangASTType::AddMethodToCXXRecordType (
cxx_method_decl->setVirtualAsWritten (is_virtual);
if (is_attr_used)
- cxx_method_decl->addAttr(::new (*m_ast) UsedAttr(SourceRange(), *m_ast));
+ cxx_method_decl->addAttr(clang::UsedAttr::CreateImplicit(*m_ast));
// Populate the method decl with parameter decls
@@ -4761,7 +4761,7 @@ ClangASTType::AddMethodToCXXRecordType (
SourceLocation(),
SourceLocation(),
NULL, // anonymous
- method_function_prototype->getArgType(param_index),
+ method_function_prototype->getParamType(param_index),
NULL,
SC_None,
NULL));
@@ -5134,7 +5134,7 @@ ClangASTType::AddMethodToObjCObjectType
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.
@@ -5143,7 +5143,7 @@ ClangASTType::AddMethodToObjCObjectType
SourceLocation(), // beginLoc,
SourceLocation(), // endLoc,
method_selector,
- method_function_prototype->getResultType(),
+ method_function_prototype->getReturnType(),
NULL, // TypeSourceInfo *ResultTInfo,
GetDeclContextForType (),
name[0] == '-',
@@ -5169,7 +5169,7 @@ ClangASTType::AddMethodToObjCObjectType
SourceLocation(),
SourceLocation(),
NULL, // anonymous
- method_function_prototype->getArgType(param_index),
+ method_function_prototype->getParamType(param_index),
NULL,
SC_Auto,
NULL));
More information about the svn-src-projects
mailing list