From 955fe6f6eda9a740dbaadb7a67a2fa48ceb88049 Mon Sep 17 00:00:00 2001
From: Todd Fiala <tfiala@google.com>
Date: Thu, 27 Feb 2014 17:18:23 +0000
Subject: Fix build break due to signature change on ASTContext'
 setExternalSource parameter.

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

llvm-svn: 202411
---
 lldb/include/lldb/Symbol/ClangASTContext.h                            | 2 +-
 .../LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp     | 2 +-
 lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp              | 2 +-
 lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp      | 2 +-
 lldb/source/Symbol/ClangASTContext.cpp                                | 4 ++--
 lldb/source/Target/Target.cpp                                         | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/lldb/include/lldb/Symbol/ClangASTContext.h b/lldb/include/lldb/Symbol/ClangASTContext.h
index 75fc07b480e..f663ef023d8 100644
--- a/lldb/include/lldb/Symbol/ClangASTContext.h
+++ b/lldb/include/lldb/Symbol/ClangASTContext.h
@@ -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 ();
diff --git a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp
index 9ddd2ac3d38..a7bb68005c1 100644
--- a/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp
+++ b/lldb/source/Plugins/LanguageRuntime/ObjC/AppleObjCRuntime/AppleObjCTypeVendor.cpp
@@ -168,7 +168,7 @@ AppleObjCTypeVendor::AppleObjCTypeVendor(ObjCLanguageRuntime &runtime) :
     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);
 }
 
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
index c1aecfe8eb6..28cbe82ebc8 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
@@ -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,
diff --git a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
index 856c42c2c9a..c12dd621402 100644
--- a/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
+++ b/lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp
@@ -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,
diff --git a/lldb/source/Symbol/ClangASTContext.cpp b/lldb/source/Symbol/ClangASTContext.cpp
index 4f30ccfc0de..aeba626190c 100644
--- a/lldb/source/Symbol/ClangASTContext.cpp
+++ b/lldb/source/Symbol/ClangASTContext.cpp
@@ -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);
diff --git a/lldb/source/Target/Target.cpp b/lldb/source/Target/Target.cpp
index e7816266b41..79454b27bb7 100644
--- a/lldb/source/Target/Target.cpp
+++ b/lldb/source/Target/Target.cpp
@@ -1765,7 +1765,7 @@ Target::GetScratchClangASTContext(bool create_on_demand)
         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();
-- 
cgit v1.2.3