diff options
author | Ewan Crawford <ewan@codeplay.com> | 2015-09-22 13:36:35 +0000 |
---|---|---|
committer | Ewan Crawford <ewan@codeplay.com> | 2015-09-22 13:36:35 +0000 |
commit | d10ca9deee5743dbb96632a92fe575ae73da4723 (patch) | |
tree | d11b1b5b36c8484c53d3f6e189788dfc1065dfa4 /lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime | |
parent | 86cce7001013c1c6703cf1c58d05028d6a26af68 (diff) | |
download | bcm5719-llvm-d10ca9deee5743dbb96632a92fe575ae73da4723.tar.gz bcm5719-llvm-d10ca9deee5743dbb96632a92fe575ae73da4723.zip |
RenderScript lookup bug fix
After the std::move operation the unique pointer is null.
So this statement always returns a null pointer.
Also remove unnecessary call to Module::ParseAllDebugSymbols(),
which spews errors due to how it incorrectly tries to parse DWARF DIE types.
llvm-svn: 248274
Diffstat (limited to 'lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime')
-rw-r--r-- | lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp index 20a3de0ea6f..7d887be4134 100644 --- a/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp +++ b/lldb/source/Plugins/LanguageRuntime/RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp @@ -1225,7 +1225,7 @@ RenderScriptRuntime::LookUpScript(addr_t address, bool create) std::unique_ptr<ScriptDetails> s(new ScriptDetails); s->script = address; m_scripts.push_back(std::move(s)); - return s.get(); + return m_scripts.back().get(); } return nullptr; } @@ -1244,7 +1244,7 @@ RenderScriptRuntime::LookUpAllocation(addr_t address, bool create) std::unique_ptr<AllocationDetails> a(new AllocationDetails); a->address = address; m_allocations.push_back(std::move(a)); - return a.get(); + return m_allocations.back().get(); } return nullptr; } @@ -1254,7 +1254,6 @@ RSModuleDescriptor::Dump(Stream &strm) const { strm.Indent(); m_module->GetFileSpec().Dump(&strm); - m_module->ParseAllDebugSymbols(); if(m_module->GetNumCompileUnits()) { strm.Indent("Debug info loaded."); |