Merge commit '32757f073852' from swift/release/5.5 into swift/main

Author: git apple-llvm automerger

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

@@ -7631,9 +7631,7 @@ CompilerType
 SwiftASTContext::GetTypeForFormatters(opaque_compiler_type_t type) {
   VALID_OR_RETURN_CHECK_TYPE(type, CompilerType());
 
-  swift::Type swift_type(GetSwiftType(type));
-  assert(&swift_type->getASTContext() == GetASTContext());
-  return ToCompilerType({swift_type});
+  return {this, type};
 }
 
 LazyBool SwiftASTContext::ShouldPrintAsOneLiner(opaque_compiler_type_t type,

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

@@ -2682,7 +2682,10 @@ TypeSystemSwiftTypeRef::GetNumTemplateArguments(opaque_compiler_type_t type) {
 
 CompilerType
 TypeSystemSwiftTypeRef::GetTypeForFormatters(opaque_compiler_type_t type) {
-  return m_swift_ast_context->GetTypeForFormatters(ReconstructType(type));
+  auto impl = [&]() -> CompilerType { return {this, type}; };
+  VALIDATE_AND_RETURN(impl, GetTypeForFormatters, type,
+                      (ReconstructType(type)),
+                      (ReconstructType(type)));
 }
 
 LazyBool

lldb/test/API/lang/swift/foundation_value_types/decimal/TestSwiftFoundationTypeDecimal.py

@@ -2,7 +2,5 @@
 from lldbsuite.test.decorators import *
 
 lldbinline.MakeInlineTest(__file__, globals(),
-                          decorators=[swiftTest,skipUnlessFoundation,skipIf(oslist=['windows']),
-expectedFailureAll(oslist=['macosx'],bugnumber="rdar://60396797",
-                   setting=('symbols.use-swift-clangimporter', 'false'))
+                          decorators=[swiftTest,skipUnlessFoundation,skipIf(oslist=['windows'])
 ])