Commit 2aec4b48 authored by Raphael Isemann's avatar Raphael Isemann
Browse files

[lldb][NFC] Don't implement ClangASTContext::SetMetadata again as a static method 

We always have an ClangASTContext when we call this method so we might as
well always call the non-static version.
parent 5f620877

lldb/include/lldb/Symbol/ClangASTContext.h

+1 −6
Original line number Diff line number Diff line
@@ -132,12 +132,7 @@ public: 


  void SetMetadataAsUserID(const void *object, lldb::user_id_t user_id);



  void SetMetadata(const void *object, ClangASTMetadata &meta_data) {

    SetMetadata(getASTContext(), object, meta_data);

  }



  static void SetMetadata(clang::ASTContext *ast, const void *object,

                          ClangASTMetadata &meta_data);

  void SetMetadata(const void *object, ClangASTMetadata &meta_data);



  ClangASTMetadata *GetMetadata(const void *object) {

    return GetMetadata(getASTContext(), object);

lldb/source/Symbol/ClangASTContext.cpp

+8 −7
Original line number Diff line number Diff line
@@ -1344,7 +1344,7 @@ CompilerType ClangASTContext::CreateRecordType( 


  if (decl) {

    if (metadata)

      SetMetadata(ast, decl, *metadata);

      SetMetadata(decl, *metadata);



    if (access_type != eAccessNone)

      decl->setAccess(ConvertAccessTypeToAccessSpecifier(access_type));
@@ -1701,7 +1701,7 @@ CompilerType ClangASTContext::CreateObjCClass(const char *name, 
      isInternal);



  if (decl && metadata)

    SetMetadata(ast, decl, *metadata);

    SetMetadata(decl, *metadata);



  return CompilerType(this, ast->getObjCInterfaceType(decl).getAsOpaquePtr());

}
@@ -2405,10 +2405,11 @@ void ClangASTContext::SetMetadataAsUserID(const void *object, 
  SetMetadata(object, meta_data);

}



void ClangASTContext::SetMetadata(clang::ASTContext *ast, const void *object,

void ClangASTContext::SetMetadata(const void *object,

                                  ClangASTMetadata &metadata) {

  ClangExternalASTSourceCommon *external_source =

      ClangExternalASTSourceCommon::Lookup(ast->getExternalSource());

      ClangExternalASTSourceCommon::Lookup(

          getASTContext()->getExternalSource());



  if (external_source)

    external_source->SetMetadata(object, metadata);
@@ -7662,7 +7663,7 @@ bool ClangASTContext::AddObjCClassProperty( 
    return false;



  if (metadata)

    ClangASTContext::SetMetadata(clang_ast, property_decl, *metadata);

    ast->SetMetadata(property_decl, *metadata);



  class_interface_decl->addDecl(property_decl);
@@ -7745,7 +7746,7 @@ bool ClangASTContext::AddObjCClassProperty( 


    if (getter) {

      if (metadata)

        ClangASTContext::SetMetadata(clang_ast, getter, *metadata);

        ast->SetMetadata(getter, *metadata);



      getter->setMethodParams(*clang_ast,

                              llvm::ArrayRef<clang::ParmVarDecl *>(),
@@ -7780,7 +7781,7 @@ bool ClangASTContext::AddObjCClassProperty( 


    if (setter) {

      if (metadata)

        ClangASTContext::SetMetadata(clang_ast, setter, *metadata);

        ast->SetMetadata(setter, *metadata);



      llvm::SmallVector<clang::ParmVarDecl *, 1> params;

      params.push_back(clang::ParmVarDecl::Create(