Merge pull request swiftlang#2002 from adrian-prantl/unxfail-main

Fix some regressions uncovered by swiftlang#1997

Author: adrian-prantl

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -998,8 +998,6 @@ MaterializeVariable(SwiftASTManipulatorBase::VariableInfo &variable,
       });
       actual_type =
           ToCompilerType(transformed_type->mapTypeOutOfContext().getPointer());
-      //        CompilerType return_ast_type =
-      // ToCompilerType(result_type->mapTypeOutOfContext());
       auto *swift_ast_ctx =
           llvm::cast<SwiftASTContext>(actual_type.GetTypeSystem());
 

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

@@ -1910,7 +1910,7 @@ bool TypeSystemSwiftTypeRef::IsImportedType(opaque_compiler_type_t type,
     StringRef ident = GetObjCTypeName(node);
     if (ident.empty())
       return {};
-    if (original_type && GetModule())
+    if (original_type)
       if (TypeSP clang_type = LookupClangType(m_swift_ast_context, ident))
         *original_type = clang_type->GetForwardCompilerType();
     return true;
@@ -2091,48 +2091,46 @@ bool TypeSystemSwiftTypeRef::IsPointerOrReferenceType(
 llvm::Optional<size_t>
 TypeSystemSwiftTypeRef::GetTypeBitAlign(opaque_compiler_type_t type,
                                         ExecutionContextScope *exe_scope) {
-    auto impl = [&]() -> llvm::Optional<size_t> {
-    // Clang types can be resolved even without a process.
-    if (CompilerType clang_type = GetAsClangTypeOrNull(type)) {
-      // Swift doesn't know pointers: return the size alignment of the
-      // object pointer instead of the underlying object.
-      if (Flags(clang_type.GetTypeInfo()).AllSet(eTypeIsObjC | eTypeIsClass))
-        return GetPointerByteSize() * 8;
-      return clang_type.GetTypeBitAlign(exe_scope);
-    }
-    if (!exe_scope) {
-      LLDB_LOGF(GetLogIfAllCategoriesSet(LIBLLDB_LOG_TYPES),
-                "Couldn't compute alignment of type %s without an execution "
-                "context.",
-                AsMangledName(type));
-      return {};
-    }
-    if (auto *runtime =
-            SwiftLanguageRuntime::Get(exe_scope->CalculateProcess())) {
-      if (auto result = runtime->GetBitAlignment({this, type}, exe_scope))
-        return result;
-      // If this is an expression context, perhaps the type was
-      // defined in the expression. In that case we don't have debug
-      // info for it, so defer to SwiftASTContext.
-      if (llvm::isa<SwiftASTContextForExpressions>(m_swift_ast_context))
-        return ReconstructType({this, type}).GetTypeBitAlign(exe_scope);
-    }
-
-    // If there is no process, we can still try to get the static
-    // alignment information out of DWARF. Because it is stored in the
-    // Type object we need to look that up by name again.
-    if (TypeSP type_sp = LookupTypeInModule(type))
-      return type_sp->GetLayoutCompilerType().GetTypeBitAlign(exe_scope);
+  // This method doesn't use VALIDATE_AND_RETURN because except for
+  // fixed-size types the SwiftASTContext implementation forwards to
+  // SwiftLanguageRuntime anyway and for many fixed-size types the
+  // fixed layout still returns an incorrect default alignment of 0.
+  //
+  // Clang types can be resolved even without a process.
+  if (CompilerType clang_type = GetAsClangTypeOrNull(type)) {
+    // Swift doesn't know pointers: return the size alignment of the
+    // object pointer instead of the underlying object.
+    if (Flags(clang_type.GetTypeInfo()).AllSet(eTypeIsObjC | eTypeIsClass))
+      return GetPointerByteSize() * 8;
+    return clang_type.GetTypeBitAlign(exe_scope);
+  }
+  if (!exe_scope) {
     LLDB_LOGF(GetLogIfAllCategoriesSet(LIBLLDB_LOG_TYPES),
-              "Couldn't compute alignment of type %s without a process.",
+              "Couldn't compute alignment of type %s without an execution "
+              "context.",
               AsMangledName(type));
     return {};
-  };
-  if (exe_scope && exe_scope->CalculateProcess())
-    VALIDATE_AND_RETURN(impl, GetTypeBitAlign, type,
-                        (ReconstructType(type), exe_scope));
-  else
-    return impl();
+  }
+  if (auto *runtime =
+          SwiftLanguageRuntime::Get(exe_scope->CalculateProcess())) {
+    if (auto result = runtime->GetBitAlignment({this, type}, exe_scope))
+      return result;
+    // If this is an expression context, perhaps the type was
+    // defined in the expression. In that case we don't have debug
+    // info for it, so defer to SwiftASTContext.
+    if (llvm::isa<SwiftASTContextForExpressions>(m_swift_ast_context))
+      return ReconstructType({this, type}).GetTypeBitAlign(exe_scope);
+  }
+
+  // If there is no process, we can still try to get the static
+  // alignment information out of DWARF. Because it is stored in the
+  // Type object we need to look that up by name again.
+  if (TypeSP type_sp = LookupTypeInModule(type))
+    return type_sp->GetLayoutCompilerType().GetTypeBitAlign(exe_scope);
+  LLDB_LOGF(GetLogIfAllCategoriesSet(LIBLLDB_LOG_TYPES),
+            "Couldn't compute alignment of type %s without a process.",
+            AsMangledName(type));
+  return {};
 }
 bool TypeSystemSwiftTypeRef::IsTypedefType(opaque_compiler_type_t type) {
   return m_swift_ast_context->IsTypedefType(ReconstructType(type));

lldb/test/API/lang/swift/dwarfimporter/C/TestSwiftDWARFImporterC.py

@@ -67,7 +67,6 @@ def test_dwarf_importer(self):
         target.Clear()
         lldb.SBDebugger.MemoryPressureDetected()
 
-    @expectedFailureAll #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
     @skipIf(archs=['ppc64le'], bugnumber='SR-10214')
     @swiftTest
     # This test needs a working Remote Mirrors implementation.

lldb/test/API/lang/swift/optionset/TestSwiftOptionSetType.py

@@ -14,7 +14,6 @@
 
 lldbinline.MakeInlineTest(__file__, globals(),
                           decorators=[swiftTest,skipUnlessDarwin,
-        expectedFailureAll, #FIXME: This regressed silently due to 2c911bceb06ed376801251bdfd992905a66f276c
         expectedFailureAll(bugnumber="rdar://60396797",
                            setting=('symbols.use-swift-clangimporter', 'false'))
 ])