Merge commit '771130a54aed' from swift/release/6.2 into stable/20240723

Author: git apple-llvm automerger

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

@@ -2707,18 +2707,17 @@ SwiftASTContext::CreateInstance(const SymbolContext &sc,
 
   CompileUnit *cu = sc.comp_unit;
   const char *key = TypeSystemSwiftTypeRef::DeriveKeyFor(sc);
-  bool swift_context = cu && cu->GetLanguage() == eLanguageTypeSwift;
   std::string m_description;
   {
     StreamString ss;
     ss << "SwiftASTContext";
     if (for_expressions)
       ss << "ForExpressions";
     ss << "(module: " << '"' << key << "\", " << "cu: " << '"';
-    if (cu && swift_context)
+    if (cu)
       ss << cu->GetPrimaryFile().GetFilename();
     else
-      ss << "*";
+      ss << "null";
     ss << '"' << ')';
     m_description = ss.GetString();
   }
@@ -2798,8 +2797,7 @@ SwiftASTContext::CreateInstance(const SymbolContext &sc,
   ModuleList module_module;
   if (!target_sp)
     module_module.Append(module_sp);
-  ModuleList &modules =
-      (target_sp && swift_context) ? target_sp->GetImages() : module_module;
+  ModuleList &modules = target_sp ? target_sp->GetImages() : module_module;
   const size_t num_images = modules.GetSize();
 
   // Set the SDK path prior to doing search paths.  Otherwise when we
@@ -3135,8 +3133,7 @@ SwiftASTContext::CreateInstance(const SymbolContext &sc,
           }
         }
       };
-  if (swift_context)
-    scan_module(module_sp, 0);
+  scan_module(module_sp, 0);
   for (size_t mi = 0; mi != num_images; ++mi) {
     auto image_sp = modules.GetModuleAtIndex(mi);
     if (!visited_modules.count(image_sp.get()))

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

@@ -2072,14 +2072,15 @@ ConstString TypeSystemSwiftTypeRef::GetSwiftModuleFor(const SymbolContext &sc) {
 }
 
 const char *TypeSystemSwiftTypeRef::DeriveKeyFor(const SymbolContext &sc) {
-  if (sc.comp_unit && sc.comp_unit->GetLanguage() == eLanguageTypeSwift)
+  if (sc.function)
     if (ConstString name = GetSwiftModuleFor(sc))
       return name.GetCString();
 
-  // Otherwise create a catch-all context per unique triple.
-  if (sc.module_sp)
-    return ConstString(sc.module_sp->GetArchitecture().GetTriple().str()).AsCString();
-
+  if (sc.module_sp) {
+    if (sc.module_sp->GetFileSpec())
+      return sc.module_sp->GetFileSpec().GetFilename().GetCString();
+    return sc.module_sp->GetObjectName().GetCString();
+  }
   return nullptr;
 }
 
@@ -2562,9 +2563,6 @@ template <> bool Equivalent<CompilerType>(CompilerType l, CompilerType r) {
   ConstString rhs = r.GetMangledTypeName();
   if (lhs == ConstString("$sSiD") && rhs == ConstString("$sSuD"))
     return true;
-  if (lhs.GetStringRef() == "$sSPySo0023unnamedstruct_hEEEdhdEaVGSgD" &&
-      rhs.GetStringRef() == "$ss13OpaquePointerVSgD")
-    return true;
   // Ignore missing sugar.
   swift::Demangle::Demangler dem;
   auto l_node = GetDemangledType(dem, lhs.GetStringRef());

lldb/test/API/lang/swift/po/objc/Base.h

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>CFExecutableName</key>
+	<string>test</string>
+</dict>
+</plist>

lldb/test/API/lang/swift/po/objc/Foo.swift

@@ -0,0 +1,16 @@
+all: dylib xctest
+C_SOURCES=xctest.c
+EXE=xctest
+
+include Makefile.rules
+
+.PHONY: dylib
+dylib:
+	"$(MAKE)" MAKE_DSYM=$(MAKE_DSYM) CC=$(CC) SWIFTC=$(SWIFTC) \
+		ARCH=$(ARCH) DSYMUTIL=$(DSYMUTIL) \
+		VPATH=$(SRCDIR) -I $(SRCDIR) -f $(SRCDIR)/dylib.mk all
+
+clean::
+	rm -rf *.o *.dSYM *.dylib *.swiftdoc *.swiftmodule *.xctest xctest
+	"$(MAKE)" VPATH=$(SRCDIR) -f $(SRCDIR)/dylib.mk clean
+