Merge pull request #1745 from medismailben/swift/master-next

[lldb/interpreter] Add Swift REPL init file support

Author: medismailben

lldb/source/Interpreter/CommandInterpreter.cpp

@@ -2096,9 +2096,12 @@ static void GetHomeInitFile(llvm::SmallVectorImpl<char> &init_file,
   FileSystem::Instance().Resolve(init_file);
 }
 
-static void GetHomeREPLInitFile(llvm::SmallVectorImpl<char> &init_file,
-                                LanguageType language) {
-  if (language == LanguageType::eLanguageTypeUnknown)
+static void GetHomeREPLInitFile(llvm::SmallVectorImpl<char> &init_file) {
+  LanguageSet repl_languages = Language::GetLanguagesSupportingREPLs();
+  LanguageType language = eLanguageTypeUnknown;
+  if (auto main_repl_language = repl_languages.GetSingularLanguage())
+    language = *main_repl_language;
+  else
     return;
 
   std::string init_file_name =
@@ -2196,13 +2199,8 @@ void CommandInterpreter::SourceInitFileHome(CommandReturnObject &result,
 
   llvm::SmallString<128> init_file;
 
-  if (is_repl) {
-    LanguageType language = {};
-    TargetSP target_sp = GetDebugger().GetSelectedTarget();
-    if (target_sp)
-      language = target_sp->GetLanguage();
-    GetHomeREPLInitFile(init_file, language);
-  }
+  if (is_repl)
+    GetHomeREPLInitFile(init_file);
 
   if (init_file.empty())
     GetHomeInitFile(init_file);

lldb/test/Shell/SwiftREPL/InitFile.test

@@ -0,0 +1,11 @@
+// Test that the Swift REPL init file works.
+// REQUIRES: system-darwin
+// RUN: export HOME=%t
+// RUN: mkdir -p %t
+// RUN: echo 'br set -f main.c -l 123' > ~/.lldbinit
+// RUN: echo 'br set -f swift-repl.c -l 456' > ~/.lldbinit-swift-repl
+// RUN: %lldb-init --repl < %s 2>&1 | FileCheck %s
+
+:br list
+// CHECK: Current breakpoints
+// CHECK-NEXT: file = 'swift-repl.c', line = 456, exact_match = 0, locations = 0 (pending)