Made GetScratchTypeSystemForLanguage return an error if desired.

Also made it not store nullptrs in its TypeSystemMap, so it will retry to make
the AST context if it errored out last time.

llvm-svn: 249167

1 files changed, 3 insertions, 2 deletions

diff --git a/lldb/source/Expression/Materializer.cpp b/lldb/source/Expression/Materializer.cpp
index 05ae34a9560..9b1a11e23f7 100644
--- a/lldb/source/Expression/Materializer.cpp
+++ b/lldb/source/Expression/Materializer.cpp
@@ -857,11 +857,12 @@ public:
             return;
         }
         
-        TypeSystem *type_system = target_sp->GetScratchTypeSystemForLanguage(m_type.GetMinimumLanguage());
+        Error type_system_error;
+        TypeSystem *type_system = target_sp->GetScratchTypeSystemForLanguage(&type_system_error, m_type.GetMinimumLanguage());
         
         if (!type_system)
         {
-            err.SetErrorString("Couldn't dematerialize a result variable: couldn't get the corresponding type system");
+            err.SetErrorStringWithFormat("Couldn't dematerialize a result variable: couldn't get the corresponding type system: %s", type_system_error.AsCString());
             return;
         }