From d10ca9deee5743dbb96632a92fe575ae73da4723 Mon Sep 17 00:00:00 2001
From: Ewan Crawford <ewan@codeplay.com>
Date: Tue, 22 Sep 2015 13:36:35 +0000
Subject: [PATCH] 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
---
 .../RenderScript/RenderScriptRuntime/RenderScriptRuntime.cpp | 5 ++---
 1 file 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 20a3de0ea6f8..7d887be41345 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.");