Merge commit '85c78e85b83f' from swift/release/5.5 into swift/main

Author: git apple-llvm automerger

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntimeNames.cpp

@@ -682,6 +682,7 @@ SwiftLanguageRuntime::DemangleSymbolAsString(StringRef symbol, DemangleMode mode
     options.QualifyEntities = true;
     options.DisplayModuleNames = true;
     options.DisplayLocalNameContexts = false;
+    options.DisplayDebuggerGeneratedModule = false;
     break;    
   }
 

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

@@ -3168,6 +3168,15 @@ bool TypeSystemSwiftTypeRef::IsTypedefType(opaque_compiler_type_t type) {
   NodePointer node = GetDemangledType(dem, AsMangledName(type));
   if (node && node->getKind() == Node::Kind::BuiltinTypeName)
     return impl();
+
+  // This is a discrepancy with `SwiftASTContext`. `impl` correctly
+  // returns true, but `VALIDATE_AND_RETURN` will assert. This hardcoded
+  // handling of `__C.NSNotificationName` and `__C.NSDecimal` can be removed
+  // when the `VALIDATE_AND_RETURN` is removed.
+  auto mangled_name = GetMangledTypeName(type);
+  if (mangled_name == "$sSo18NSNotificationNameaD" ||
+      mangled_name == "$sSo9NSDecimalaD")
+    return impl();
 #endif
   VALIDATE_AND_RETURN(impl, IsTypedefType, type, (ReconstructType(type)),
                       (ReconstructType(type)));
@@ -3200,6 +3209,15 @@ TypeSystemSwiftTypeRef::GetTypedefedType(opaque_compiler_type_t type) {
   NodePointer node = GetDemangledType(dem, AsMangledName(type));
   if (node && node->getKind() == Node::Kind::BuiltinTypeName)
     return impl();
+
+  // This is a discrepancy with `SwiftASTContext`. `impl` correctly
+  // returns true, but `VALIDATE_AND_RETURN` will assert. This hardcoded
+  // handling of `__C.NSNotificationName` and `__C.NSDecimal` can be removed
+  // when the `VALIDATE_AND_RETURN` is removed.
+  auto mangled_name = GetMangledTypeName(type);
+  if (mangled_name == "$sSo18NSNotificationNameaD" ||
+      mangled_name == "$sSo9NSDecimalaD")
+    return impl();
 #endif
   VALIDATE_AND_RETURN(impl, GetTypedefedType, type, (ReconstructType(type)),
                       (ReconstructType(type)));