Avoid instantiating SwiftASTContextForModule in get_executable_triple() (NFC)

Instead we can directly query the triple of the module.

rdar://113997661

Author: adrian-prantl

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -2064,19 +2064,6 @@ static lldb::ModuleSP GetUnitTestModule(lldb_private::ModuleList &modules) {
   return ModuleSP();
 }
 
-static SwiftASTContext *GetModuleSwiftASTContext(Module &module) {
-  auto type_system_or_err =
-      module.GetTypeSystemForLanguage(lldb::eLanguageTypeSwift);
-  if (!type_system_or_err) {
-    llvm::consumeError(type_system_or_err.takeError());
-    return {};
-  }
-  auto *ts = llvm::dyn_cast_or_null<TypeSystemSwift>(type_system_or_err->get());
-  if (!ts)
-    return {};
-  return ts->GetSwiftASTContext();
-}
-
 /// Scan a newly added lldb::Module for Swift modules and report any errors in
 /// its module SwiftASTContext to Target.
 static void ProcessModule(
@@ -2313,10 +2300,7 @@ lldb::TypeSystemSP SwiftASTContext::CreateInstance(
     auto get_executable_triple = [&]() -> llvm::Triple {
       if (!exe_module_sp)
         return {};
-      auto *exe_ast_ctx = GetModuleSwiftASTContext(*exe_module_sp);
-      if (!exe_ast_ctx)
-        return {};
-      return exe_ast_ctx->GetLanguageOptions().Target;
+      return exe_module_sp->GetArchitecture().GetTriple();
     };
 
     llvm::Triple computed_triple;

lldb/test/API/lang/swift/clangimporter/Werror/TestSwiftStripWerror.py

@@ -17,7 +17,7 @@ def setUp(self):
     @swiftTest
     def test(self):
         """This tests that -Werror is removed from ClangImporter options by
-        introducing two conflicting macro definitions in idfferent dylibs.
+        introducing two conflicting macro definitions in different dylibs.
         """
         self.build()
         target, _, _, _ = lldbutil.run_to_source_breakpoint(
@@ -26,17 +26,13 @@ def test(self):
 
         # Turn on logging.
         log = self.getBuildArtifact("types.log")
-        self.expect("log enable lldb types -f " + log)
+        self.expect('log enable lldb types -f "%s"' % log)
 
         self.expect("expression foo", DATA_TYPES_DISPLAYED_CORRECTLY, substrs=["42"])
-        sanity = 0
-        import io
-
-        logfile = io.open(log, "r", encoding="utf-8")
-        for line in logfile:
-            self.assertFalse("-Werror" in line)
-            if "-DCONFLICT" in line:
-                sanity += 1
-        # We see -DCONFLICT twice in the expression context and once in each of
-        # the two Module contexts.
-        self.assertEqual(sanity, 2 + 2)
+        self.filecheck('platform shell cat "%s"' % log, __file__)
+#       CHECK-NOT: SwiftASTContextForExpressions{{.*}}-Werror
+#       CHECK:     SwiftASTContextForExpressions{{.*}}-DCONFLICT
+#       CHECK-NOT: SwiftASTContextForExpressions{{.*}}-Werror
+#       CHECK:     SwiftASTContextForExpressions{{.*}}-DCONFLICT
+#       CHECK-NOT: SwiftASTContextForExpressions{{.*}}-DCONFLICT
+#       CHECK-NOT: SwiftASTContextForExpressions{{.*}}-Werror

lldb/test/API/lang/swift/clangimporter/config_macros/TestSwiftDedupMacros.py

@@ -47,27 +47,15 @@ def testSwiftDebugMacros(self):
 
         # Turn on logging.
         log = self.getBuildArtifact("types.log")
-        self.expect("log enable lldb types -f " + log)
+        self.expect('log enable lldb types -f ""%s"' % log)
 
         self.expect("expression foo", DATA_TYPES_DISPLAYED_CORRECTLY, substrs=["42"])
-        debug = 0
-        space = 0
-        ndebug = 0
-        space_with_space = 0
-        import io
-
-        logfile = io.open(log, "r", encoding="utf-8")
-        for line in logfile:
-            if "-DDEBUG=1" in line:
-                debug += 1
-            if "-DSPACE" in line:
-                space += 1
-            if " SPACE" in line:
-                space_with_space += 1
-            if "-UNDEBUG" in line:
-                ndebug += 1
-        # One extra in SwiftASTContextPerModule.
-        self.assertEqual(debug, 3)
-        self.assertEqual(space, 3)
-        self.assertEqual(space_with_space, 0)
-        self.assertEqual(ndebug, 3)
+        self.filecheck('platform shell cat "%s"' % log, __file__)
+#       CHECK: SwiftASTContextForExpressions{{.*}}-DDEBUG=1
+#       CHECK: SwiftASTContextForExpressions{{.*}}-DSPACE
+#       CHECK-NOT: {{ SPACE}}
+#       CHECK: SwiftASTContextForExpressions{{.*}}-UNDEBUG
+#       CHECK: SwiftASTContextForModule("libDylib{{.*}}-DDEBUG=1
+#       CHECK: SwiftASTContextForModule("libDylib{{.*}}-DSPACE
+#       CHECK-NOT: {{ SPACE}}
+#       CHECK: SwiftASTContextForModule("libDylib{{.*}}-UNDEBUG