Merge pull request #62647 from adrian-prantl/103416237-1

Remove StorageType from DebugTypeInfo::getErrorResult().

Author: swift-ci

lib/IRGen/DebugTypeInfo.cpp

@@ -161,13 +161,9 @@ DebugTypeInfo DebugTypeInfo::getObjCClass(ClassDecl *theClass,
 }
 
 DebugTypeInfo DebugTypeInfo::getErrorResult(swift::Type Ty,
-                                            llvm::Type *StorageType,
                                             IRGenModule &IGM) {
   auto &TI = IGM.getTypeInfoForUnlowered(Ty);
-  // FIXME: Enable this. Currently breaks on i386.
-  // assert(TI.getStorageType() == StorageType);
   DebugTypeInfo DbgTy = getFromTypeInfo(Ty, TI, false);
-  assert(StorageType && "FragmentStorageType is a nullptr");
   return DbgTy;
 }
 

lib/IRGen/DebugTypeInfo.h

@@ -87,8 +87,7 @@ class DebugTypeInfo {
                                     llvm::Type *StorageType, Size size,
                                     Alignment align);
   /// Error type.
-  static DebugTypeInfo getErrorResult(swift::Type Ty, llvm::Type *StorageType,
-                                      IRGenModule &IGM);
+  static DebugTypeInfo getErrorResult(swift::Type Ty, IRGenModule &IGM);
 
   TypeBase *getType() const { return Type; }
 

lib/IRGen/IRGenSIL.cpp

@@ -4877,8 +4877,7 @@ void IRGenSILFunction::emitErrorResultVar(CanSILFunctionType FnTy,
     return;
   auto DbgTy = DebugTypeInfo::getErrorResult(
       ErrorInfo.getReturnValueType(IGM.getSILModule(), FnTy,
-                                   IGM.getMaximalTypeExpansionContext()),
-      ErrorResultSlot->getType(), IGM);
+                                   IGM.getMaximalTypeExpansionContext()),IGM);
   IGM.DebugInfo->emitVariableDeclaration(Builder, Storage, DbgTy,
                                          getDebugScope(), {}, *Var,
                                          IndirectValue, ArtificialValue);