Merge pull request #1953 from Teemperor/RemoveSaveExpressionTextToTempFile

[ExpressionSourceCode] Move Swift-only function SaveExpressionTextToTempFile to the Swift source.

apple-llvm-split-commit: b409507cd31a0b7a4f111de6f07d67a6e2a854ca
apple-llvm-split-dir: lldb/

Author: dcci

lldb/include/lldb/Expression/ExpressionSourceCode.h

@@ -45,10 +45,6 @@ class ExpressionSourceCode {
                const EvaluateExpressionOptions &options,
                ExecutionContext &exe_ctx, uint32_t &first_body_line) const;
 
-  static bool
-  SaveExpressionTextToTempFile(llvm::StringRef text,
-                               const EvaluateExpressionOptions &options,
-                               std::string &expr_source_path);
   // Given a string returned by GetText, find the beginning and end of the body
   // passed to CreateWrapped. Return true if the bounds could be found.  This
   // will also work on text with FixItHints applied.

lldb/source/Expression/ExpressionSourceCode.cpp

@@ -226,65 +226,6 @@ static void AddLocalVariableDecls(const lldb::VariableListSP &var_list_sp,
   }
 }
 
-bool ExpressionSourceCode::SaveExpressionTextToTempFile(
-    llvm::StringRef text, const EvaluateExpressionOptions &options,
-    std::string &expr_source_path) {
-  bool success = false;
-
-  const uint32_t expr_number = options.GetExpressionNumber();
-
-  const bool playground = options.GetPlaygroundTransformEnabled();
-  const bool repl = options.GetREPLEnabled();
-
-  llvm::StringRef file_prefix;
-  if (playground)
-    file_prefix = "playground";
-  else if (repl)
-    file_prefix = "repl";
-  else
-    file_prefix = "expr";
-
-  llvm::Twine prefix = llvm::Twine(file_prefix).concat(llvm::Twine(expr_number));
-
-  llvm::StringRef suffix;
-  switch (options.GetLanguage()) {
-  default:
-    suffix = ".cpp";
-    break;
-
-  case lldb::eLanguageTypeSwift:
-    suffix = ".swift";
-    break;
-  }
-
-  int temp_fd;
-  llvm::SmallString<128> buffer;
-  std::error_code err =
-      llvm::sys::fs::createTemporaryFile(prefix, suffix, temp_fd, buffer);
-  if (!err) {
-    lldb_private::File file(temp_fd, true);
-    const size_t text_len = text.size();
-    size_t bytes_written = text_len;
-    if (file.Write(text.data(), bytes_written).Success()) {
-      if (bytes_written == text_len) {
-        // Make sure we have a newline in the file at the end
-        bytes_written = 1;
-        file.Write("\n", bytes_written);
-        if (bytes_written == 1)
-          success = true;
-      }
-    }
-    if (!success)
-      llvm::sys::fs::remove(expr_source_path);
-  }
-  if (!success)
-    expr_source_path.clear();
-  else
-    expr_source_path = buffer.str().str();
-
-  return success;
-}
-
 /// Format the OS name the way that Swift availability attributes do.
 static llvm::StringRef getAvailabilityName(const llvm::Triple &triple) {
     swift::LangOptions lang_options;

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

@@ -123,7 +123,7 @@ __builtin_logger_initialize()
                       pound_file, pound_line, orig_text);
     text = fixed_text.GetString().data();
   } else if (generate_debug_info) {
-    if (ExpressionSourceCode::SaveExpressionTextToTempFile(orig_text, options,
+    if (SwiftASTManipulator::SaveExpressionTextToTempFile(orig_text, options,
                                                            expr_source_path)) {
       fixed_text.Printf("#sourceLocation(file: \"%s\", line: 1)\n%s\n",
                         expr_source_path.c_str(), orig_text);
@@ -1396,3 +1396,62 @@ swift::ValueDecl *SwiftASTManipulator::MakeGlobalTypealias(
 
   return type_alias_decl;
 }
+
+bool SwiftASTManipulator::SaveExpressionTextToTempFile(
+    llvm::StringRef text, const EvaluateExpressionOptions &options,
+    std::string &expr_source_path) {
+  bool success = false;
+
+  const uint32_t expr_number = options.GetExpressionNumber();
+
+  const bool playground = options.GetPlaygroundTransformEnabled();
+  const bool repl = options.GetREPLEnabled();
+
+  llvm::StringRef file_prefix;
+  if (playground)
+    file_prefix = "playground";
+  else if (repl)
+    file_prefix = "repl";
+  else
+    file_prefix = "expr";
+
+  llvm::Twine prefix = llvm::Twine(file_prefix).concat(llvm::Twine(expr_number));
+
+  llvm::StringRef suffix;
+  switch (options.GetLanguage()) {
+  default:
+    suffix = ".cpp";
+    break;
+
+  case lldb::eLanguageTypeSwift:
+    suffix = ".swift";
+    break;
+  }
+
+  int temp_fd;
+  llvm::SmallString<128> buffer;
+  std::error_code err =
+      llvm::sys::fs::createTemporaryFile(prefix, suffix, temp_fd, buffer);
+  if (!err) {
+    lldb_private::File file(temp_fd, true);
+    const size_t text_len = text.size();
+    size_t bytes_written = text_len;
+    if (file.Write(text.data(), bytes_written).Success()) {
+      if (bytes_written == text_len) {
+        // Make sure we have a newline in the file at the end
+        bytes_written = 1;
+        file.Write("\n", bytes_written);
+        if (bytes_written == 1)
+          success = true;
+      }
+    }
+    if (!success)
+      llvm::sys::fs::remove(expr_source_path);
+  }
+  if (!success)
+    expr_source_path.clear();
+  else
+    expr_source_path = buffer.str().str();
+
+  return success;
+}

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

@@ -182,6 +182,11 @@ class SwiftASTManipulator : public SwiftASTManipulatorBase {
     return "\n/*__LLDB_USER_END__*/";
   }
 
+  static bool
+  SaveExpressionTextToTempFile(llvm::StringRef text,
+                               const EvaluateExpressionOptions &options,
+                               std::string &expr_source_path);
+
 private:
   uint32_t m_tmpname_idx = 0;
 

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

@@ -934,8 +934,7 @@ CreateMainFile(SwiftASTContext &swift_ast_context, StringRef filename,
 
   if (generate_debug_info) {
     std::string temp_source_path;
-    if (ExpressionSourceCode::SaveExpressionTextToTempFile(text, options,
-                                                           temp_source_path)) {
+    if (SwiftASTManipulator::SaveExpressionTextToTempFile(text, options, temp_source_path)) {
       auto error_or_buffer_ap =
           llvm::MemoryBuffer::getFile(temp_source_path.c_str());
       if (error_or_buffer_ap.getError() == std::error_condition()) {