maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

rdar://problem/10501020 

ClangASTSource::~ClangASTSource() was calling

    ClangASTContext *scratch_clang_ast_context = m_target->GetScratchClangASTContext();

which had the side effect of deleting this very ClangASTSource instance.  Not good.
Change it to

    // We are in the process of destruction, don't create clang ast context on demand
    // by passing false to Target::GetScratchClangASTContext(create_on_demand).
    ClangASTContext *scratch_clang_ast_context = m_target->GetScratchClangASTContext(false);

The Target::GetScratchClangASTContext(bool create_on_demand=true) has a new signature.

llvm-svn: 145537
This commit is contained in:
Johnny Chen 2011-11-30 23:18:53 +00:00
parent b9e53ed4e2
commit 60e2c6aa43
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lldb/include/lldb/Target/Target.h
View File

@ -799,7 +799,7 @@ public:
GetImageSearchPathList (); GetImageSearchPathList ();
ClangASTContext * ClangASTContext *
GetScratchClangASTContext(); GetScratchClangASTContext(bool create_on_demand=true);
ClangASTImporter * ClangASTImporter *
GetClangASTImporter(); GetClangASTImporter();

4
lldb/source/Expression/ClangASTSource.cpp
View File

@ -27,7 +27,9 @@ ClangASTSource::~ClangASTSource()
{ {
m_ast_importer->ForgetDestination(m_ast_context); m_ast_importer->ForgetDestination(m_ast_context);
ClangASTContext *scratch_clang_ast_context = m_target->GetScratchClangASTContext(); // We are in the process of destruction, don't create clang ast context on demand
// by passing false to Target::GetScratchClangASTContext(create_on_demand).
ClangASTContext *scratch_clang_ast_context = m_target->GetScratchClangASTContext(false);
if (!scratch_clang_ast_context) if (!scratch_clang_ast_context)
return; return;

4
lldb/source/Target/Target.cpp
View File

@ -1335,10 +1335,10 @@ Target::ImageSearchPathsChanged
} }
ClangASTContext * ClangASTContext *
Target::GetScratchClangASTContext() Target::GetScratchClangASTContext(bool create_on_demand)
{ {
// Now see if we know the target triple, and if so, create our scratch AST context: // Now see if we know the target triple, and if so, create our scratch AST context:
if (m_scratch_ast_context_ap.get() == NULL && m_arch.IsValid()) if (m_scratch_ast_context_ap.get() == NULL && m_arch.IsValid() && create_on_demand)
{ {
m_scratch_ast_context_ap.reset (new ClangASTContext(m_arch.GetTriple().str().c_str())); m_scratch_ast_context_ap.reset (new ClangASTContext(m_arch.GetTriple().str().c_str()));
m_scratch_ast_source_ap.reset (new ClangASTSource(GetSP())); m_scratch_ast_source_ap.reset (new ClangASTSource(GetSP()));

2
lldb/test/functionalities/load_unload/TestLoadUnload.py
View File

@ -49,7 +49,7 @@ class LoadUnloadTestCase(TestBase):
# Add teardown hook to clear image-search-paths after the test. # Add teardown hook to clear image-search-paths after the test.
# rdar://problem/10501020 # rdar://problem/10501020
# Uncomment the following to reproduce 10501020. # Uncomment the following to reproduce 10501020.
#self.addTearDownHook(lambda: self.runCmd("target modules search-paths clear")) self.addTearDownHook(lambda: self.runCmd("target modules search-paths clear"))
self.expect("target modules search-paths list", self.expect("target modules search-paths list",
substrs = [os.getcwd(), new_dir]) substrs = [os.getcwd(), new_dir])