Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -1090,16 +1090,10 @@ TypeSP DWARFASTParserClang::ParseSubroutine(const DWARFDIE &die,
}

if (class_opaque_type) {
// If accessibility isn't set to anything valid, assume public
// for now...
if (attrs.accessibility == eAccessNone)
attrs.accessibility = eAccessPublic;

clang::ObjCMethodDecl *objc_method_decl =
m_ast.AddMethodToObjCObjectType(
class_opaque_type, attrs.name.GetCString(), clang_type,
attrs.accessibility, attrs.is_artificial, is_variadic,
attrs.is_objc_direct_call);
attrs.is_artificial, is_variadic, attrs.is_objc_direct_call);
type_handled = objc_method_decl != nullptr;
if (type_handled) {
LinkDeclContextToDIE(objc_method_decl, die);
Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -8110,8 +8110,8 @@ clang::ObjCMethodDecl *TypeSystemClang::AddMethodToObjCObjectType(
const char *name, // the full symbol name as seen in the symbol table
// (lldb::opaque_compiler_type_t type, "-[NString
// stringWithCString:]")
const CompilerType &method_clang_type, lldb::AccessType access,
bool is_artificial, bool is_variadic, bool is_objc_direct_call) {
const CompilerType &method_clang_type, bool is_artificial, bool is_variadic,
bool is_objc_direct_call) {
if (!type || !method_clang_type.IsValid())
return nullptr;

Expand Down
4 changes: 2 additions & 2 deletions lldb/source/Plugins/TypeSystem/Clang/TypeSystemClang.h
Original file line number Diff line number Diff line change
Expand Up @@ -985,8 +985,8 @@ class TypeSystemClang : public TypeSystem {
const char *name, // the full symbol name as seen in the symbol table
// (lldb::opaque_compiler_type_t type, "-[NString
// stringWithCString:]")
const CompilerType &method_compiler_type, lldb::AccessType access,
bool is_artificial, bool is_variadic, bool is_objc_direct_call);
const CompilerType &method_compiler_type, bool is_artificial,
bool is_variadic, bool is_objc_direct_call);

static bool SetHasExternalStorage(lldb::opaque_compiler_type_t type,
bool has_extern);
Expand Down
3 changes: 1 addition & 2 deletions lldb/unittests/Symbol/TestTypeSystemClang.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -941,8 +941,7 @@ TEST_F(TestTypeSystemClang, AddMethodToObjCObjectType) {
bool artificial = false;
bool objc_direct = false;
clang::ObjCMethodDecl *method = TypeSystemClang::AddMethodToObjCObjectType(
c, "-[A foo]", func_type, lldb::eAccessPublic, artificial, variadic,
objc_direct);
c, "-[A foo]", func_type, artificial, variadic, objc_direct);
ASSERT_NE(method, nullptr);

// The interface decl should still have external lexical storage.
Expand Down