Merge pull request #6472 from adrian-prantl/log-expr

Fix logging of typechecked AST.

Author: adrian-prantl

lldb/source/Plugins/ExpressionParser/Swift/SwiftASTManipulator.cpp

@@ -972,6 +972,7 @@ static void AddNodesToBeginningFunction(
       body->getRBraceLoc());
 
   function->setBody(new_function_body, function->getBodyKind());
+  function->setHasSingleExpressionBody(false);
 }
 
 bool SwiftASTManipulator::AddExternalVariables(
@@ -1081,9 +1082,10 @@ bool SwiftASTManipulator::AddExternalVariables(
         variable.m_decl->dump(ss);
         ss.flush();
 
-        log->Printf("[SwiftASTManipulator::AddExternalVariables] Injected "
-                    "variable %s",
-                    s.c_str());
+        LLDB_LOG(log,
+                 "[SwiftASTManipulator::AddExternalVariables] Injected "
+                 "variable {0} into {1}",
+                 s, containing_function->getName().getBaseIdentifier().str());
       }
 
       m_variables.push_back(variable);

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -1710,36 +1710,30 @@ SwiftExpressionParser::Parse(DiagnosticManager &diagnostic_manager,
     return ParseResult::unrecoverable_error;
   }
 
-  if (log) {
+  auto dumpModule = [&](const char *msg) {
     std::string s;
     llvm::raw_string_ostream ss(s);
     parsed_expr->source_file.dump(ss);
     ss.flush();
+    LLDB_LOG(log, "\n{0}\n\n{1}\n", msg, s);
+  };
 
-    log->Printf("Source file before type checking:");
-    log->PutCString(s.c_str());
-  }
+  if (log)
+    dumpModule("Module before type checking:");
 
   swift::bindExtensions(parsed_expr->module);
   swift::performTypeChecking(parsed_expr->source_file);
 
+  if (log)
+    dumpModule("Module after type checking:");
+
   if (m_swift_ast_ctx.HasErrors()) {
     DiagnoseSwiftASTContextError();
     return ParseResult::unrecoverable_error;
   }
-  if (log) {
-    std::string s;
-    llvm::raw_string_ostream ss(s);
-    parsed_expr->source_file.dump(ss);
-    ss.flush();
 
-    log->Printf("Source file after type checking:");
-    log->PutCString(s.c_str());
-  }
-
-  if (repl) {
+  if (repl)
     parsed_expr->code_manipulator->MakeDeclarationsPublic();
-  }
 
   Status error;
   if (!playground) {