When a multiline expression produces output, the multi-line help message is printed twice.

<rdar://problem/16031890> 

llvm-svn: 201171

1 files changed, 7 insertions, 12 deletions

diff --git a/lldb/source/Commands/CommandObjectExpression.cpp b/lldb/source/Commands/CommandObjectExpression.cpp
index b365164..c772a2e 100644
--- a/lldb/source/Commands/CommandObjectExpression.cpp
+++ b/lldb/source/Commands/CommandObjectExpression.cpp
@@ -365,18 +365,6 @@ CommandObjectExpression::EvaluateExpression
 }
 
 void
-CommandObjectExpression::IOHandlerActivated (IOHandler &io_handler)
-{
-    StreamFileSP output_sp(io_handler.GetOutputStreamFile());
-    if (output_sp)
-    {
-        output_sp->PutCString("Enter expressions, then terminate with an empty line to evaluate:\n");
-        output_sp->Flush();
-    }
-}
-
-
-void
 CommandObjectExpression::IOHandlerInputComplete (IOHandler &io_handler, std::string &line)
 {
     io_handler.SetIsDone(true);
@@ -441,6 +429,13 @@ CommandObjectExpression::DoExecute
                                                           NULL,             // No prompt
                                                           multiple_lines,
                                                           *this));
+        
+        StreamFileSP output_sp(io_handler_sp->GetOutputStreamFile());
+        if (output_sp)
+        {
+            output_sp->PutCString("Enter expressions, then terminate with an empty line to evaluate:\n");
+            output_sp->Flush();
+        }
         debugger.PushIOHandler(io_handler_sp);
         return result.Succeeded();
     }