[Lldb-commits] [lldb] r202411 - Fix build break due to signature change on ASTContext' setExternalSource parameter.

[Todd Fiala]

Author: tfiala
Date: Thu Feb 27 11:18:23 2014
New Revision: 202411

URL: http://llvm.org/viewvc/llvm-project?rev=202411&view=rev
Log:
Fix build break due to signature change on ASTContext' setExternalSource parameter.

This change converts points to clang::ExternalASTSource from llvm::OwningPtr<> to
llvm::IntrusiveRefCntPtr<>.

Modified:
    lldb/trunk/include/lldb/Symbol/ClangASTContext.h
    lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
    lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
    lldb/trunk/source/Symbol/ClangASTContext.cpp
    lldb/trunk/source/Target/Target.cpp

Modified: lldb/trunk/include/lldb/Symbol/ClangASTContext.h
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/include/lldb/Symbol/ClangASTContext.h?rev=202411&r1=202410&r2=202411&view=diff
==============================================================================
--- lldb/trunk/include/lldb/Symbol/ClangASTContext.h (original)
+++ lldb/trunk/include/lldb/Symbol/ClangASTContext.h Thu Feb 27 11:18:23 2014
@@ -94,7 +94,7 @@ public:
     HasExternalSource ();
 
     void
-    SetExternalSource (llvm::OwningPtr<clang::ExternalASTSource> &ast_source_ap);
+    SetExternalSource (llvm::IntrusiveRefCntPtr<clang::ExternalASTSource> &ast_source_ap);
 
     void
     RemoveExternalSource ();

Modified: lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp?rev=202411&r1=202410&r2=202411&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp (original)
+++ lldb/trunk/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp Thu Feb 27 11:18:23 2014
@@ -168,7 +168,7 @@ AppleObjCTypeVendor::AppleObjCTypeVendor
     m_ast_ctx(runtime.GetProcess()->GetTarget().GetArchitecture().GetTriple().getTriple().c_str())
 {
     m_external_source = new AppleObjCExternalASTSource (*this);
-    llvm::OwningPtr<clang::ExternalASTSource> external_source_owning_ptr (m_external_source);
+    llvm::IntrusiveRefCntPtr<clang::ExternalASTSource> external_source_owning_ptr (m_external_source);
     m_ast_ctx.getASTContext()->setExternalSource(external_source_owning_ptr);
 }
 

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp?rev=202411&r1=202410&r2=202411&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp Thu Feb 27 11:18:23 2014
@@ -525,7 +525,7 @@ SymbolFileDWARF::GetClangASTContext ()
     if (!m_is_external_ast_source)
     {
         m_is_external_ast_source = true;
-        llvm::OwningPtr<clang::ExternalASTSource> ast_source_ap (
+        llvm::IntrusiveRefCntPtr<clang::ExternalASTSource> ast_source_ap (
             new ClangExternalASTSourceCallbacks (SymbolFileDWARF::CompleteTagDecl,
                                                  SymbolFileDWARF::CompleteObjCInterfaceDecl,
                                                  SymbolFileDWARF::FindExternalVisibleDeclsByName,

Modified: lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp?rev=202411&r1=202410&r2=202411&view=diff
==============================================================================
--- lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp (original)
+++ lldb/trunk/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp Thu Feb 27 11:18:23 2014
@@ -308,7 +308,7 @@ void
 SymbolFileDWARFDebugMap::InitializeObject()
 {
     // Install our external AST source callbacks so we can complete Clang types.
-    llvm::OwningPtr<clang::ExternalASTSource> ast_source_ap (
+    llvm::IntrusiveRefCntPtr<clang::ExternalASTSource> ast_source_ap (
         new ClangExternalASTSourceCallbacks (SymbolFileDWARFDebugMap::CompleteTagDecl,
                                              SymbolFileDWARFDebugMap::CompleteObjCInterfaceDecl,
                                              NULL,

Modified: lldb/trunk/source/Symbol/ClangASTContext.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Symbol/ClangASTContext.cpp?rev=202411&r1=202410&r2=202411&view=diff
==============================================================================
--- lldb/trunk/source/Symbol/ClangASTContext.cpp (original)
+++ lldb/trunk/source/Symbol/ClangASTContext.cpp Thu Feb 27 11:18:23 2014
@@ -347,7 +347,7 @@ ClangASTContext::HasExternalSource ()
 }
 
 void
-ClangASTContext::SetExternalSource (llvm::OwningPtr<ExternalASTSource> &ast_source_ap)
+ClangASTContext::SetExternalSource (llvm::IntrusiveRefCntPtr<ExternalASTSource> &ast_source_ap)
 {
     ASTContext *ast = getASTContext();
     if (ast)
@@ -365,7 +365,7 @@ ClangASTContext::RemoveExternalSource ()
     
     if (ast)
     {
-        llvm::OwningPtr<ExternalASTSource> empty_ast_source_ap;
+        llvm::IntrusiveRefCntPtr<ExternalASTSource> empty_ast_source_ap;
         ast->setExternalSource (empty_ast_source_ap);
         ast->getTranslationUnitDecl()->setHasExternalLexicalStorage(false);
         //ast->getTranslationUnitDecl()->setHasExternalVisibleStorage(false);

Modified: lldb/trunk/source/Target/Target.cpp
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/source/Target/Target.cpp?rev=202411&r1=202410&r2=202411&view=diff
==============================================================================
--- lldb/trunk/source/Target/Target.cpp (original)
+++ lldb/trunk/source/Target/Target.cpp Thu Feb 27 11:18:23 2014
@@ -1765,7 +1765,7 @@ Target::GetScratchClangASTContext(bool c
         m_scratch_ast_context_ap.reset (new ClangASTContext(m_arch.GetTriple().str().c_str()));
         m_scratch_ast_source_ap.reset (new ClangASTSource(shared_from_this()));
         m_scratch_ast_source_ap->InstallASTContext(m_scratch_ast_context_ap->getASTContext());
-        llvm::OwningPtr<clang::ExternalASTSource> proxy_ast_source(m_scratch_ast_source_ap->CreateProxy());
+        llvm::IntrusiveRefCntPtr<clang::ExternalASTSource> proxy_ast_source(m_scratch_ast_source_ap->CreateProxy());
         m_scratch_ast_context_ap->SetExternalSource(proxy_ast_source);
     }
     return m_scratch_ast_context_ap.get();