From: Sean Callanan <scallanan@apple.com>
Date: Sat, 26 Mar 2016 00:30:40 +0000 (+0000)
Subject: Record all translation units with more than one function in them (e.g., blocks).
X-Git-Tag: llvmorg-3.9.0-rc1~10843
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47cca78efa07fcf94507e1b84b098f984493cadc;p=platform%2Fupstream%2Fllvm.git

Record all translation units with more than one function in them (e.g., blocks).

Blocks and lambdas have their implementation functions stored in the IR for an
expression.  If we put the block/lambda into a result variable it needs to stay
around.  As a heuristic, remember any execution unit that has more than one
function in it.

<rdar://problem/22864976>

llvm-svn: 264483
---

diff --git a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
index 9bf8cd5..6da103e 100644
--- a/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
+++ b/lldb/source/Plugins/ExpressionParser/Clang/ClangUserExpression.cpp
@@ -577,12 +577,18 @@ ClangUserExpression::Parse(DiagnosticManager &diagnostic_manager, ExecutionConte
         {
             register_execution_unit = true;
         }
+        
+        // If there is more than one external function in the execution
+        // unit, it needs to keep living even if it's not top level, because
+        // the result could refer to that function.
+        
+        if (m_execution_unit_sp->GetJittedFunctions().size() > 1)
+        {
+            register_execution_unit = true;
+        }
 
         if (register_execution_unit)
         {
-            // We currently key off there being more than one external function in the execution
-            // unit to determine whether it needs to live in the process.
-
             llvm::cast<PersistentExpressionState>(
                 exe_ctx.GetTargetPtr()->GetPersistentExpressionStateForLanguage(m_language))
                 ->RegisterExecutionUnit(m_execution_unit_sp);