Merge remote-tracking branch 'origin/master' into master-rebranch

Author: swift-ci

lib/IRGen/DebugTypeInfo.cpp

@@ -60,25 +60,20 @@ DebugTypeInfo DebugTypeInfo::getFromTypeInfo(swift::Type Ty,
 
 DebugTypeInfo DebugTypeInfo::getLocalVariable(VarDecl *Decl, swift::Type Ty,
                                               const TypeInfo &Info) {
+
+  auto DeclType = Decl->getInterfaceType();
+  auto RealType = Ty;
+
+  // DynamicSelfType is also sugar as far as debug info is concerned.
+  auto Sugared = DeclType;
+  if (auto DynSelfTy = DeclType->getAs<DynamicSelfType>())
+    Sugared = DynSelfTy->getSelfType();
+
   // Prefer the original, potentially sugared version of the type if
   // the type hasn't been mucked with by an optimization pass.
-  swift::Type DeclType = Decl->getInterfaceType();
-  swift::Type RealType = Ty;
-
-  swift::Type DebugType;
-  if (auto DynSelfTy = DeclType->getAs<DynamicSelfType>()) {
-    // DynamicSelfType is also sugar as far as debug info is concerned.
-    auto DesugaredSelf = DynSelfTy->getSelfType();
-    DebugType = DesugaredSelf->isEqual(RealType) ? DynSelfTy : RealType;
-  } else {
-    // Map the sugared type into the context to resolve bound generics and
-    // generic type aliases.
-    DeclContext *DeclCtx = Decl->getDeclContext();
-    swift::Type Sugared =
-        DeclCtx ? DeclCtx->mapTypeIntoContext(DeclType) : DeclType;
-    DebugType = Sugared->isEqual(RealType) ? Sugared : RealType;
-  }
-  return getFromTypeInfo(DebugType, Info);
+  auto *Type = Sugared->isEqual(RealType) ? DeclType.getPointer()
+                                          : RealType.getPointer();
+  return getFromTypeInfo(Type, Info);
 }
 
 DebugTypeInfo DebugTypeInfo::getMetadata(swift::Type Ty, llvm::Type *StorageTy,

lib/IRGen/IRGenSIL.cpp

@@ -3659,7 +3659,7 @@ void IRGenSILFunction::visitDebugValueInst(DebugValueInst *i) {
   llvm::SmallVector<llvm::Value *, 8> Copy;
   emitShadowCopyIfNeeded(SILVal, i->getDebugScope(), *VarInfo, IsAnonymous,
                          Copy);
-  bindArchetypes(RealTy);
+  bindArchetypes(DbgTy.getType());
   if (!IGM.DebugInfo)
     return;
 
@@ -3690,7 +3690,7 @@ void IRGenSILFunction::visitDebugValueAddrInst(DebugValueAddrInst *i) {
 
   auto DbgTy = DebugTypeInfo::getLocalVariable(
       Decl, RealType, getTypeInfo(SILVal->getType()));
-  bindArchetypes(RealType);
+  bindArchetypes(DbgTy.getType());
   if (!IGM.DebugInfo)
     return;
 
@@ -3990,7 +3990,7 @@ void IRGenSILFunction::emitDebugInfoForAllocStack(AllocStackInst *i,
   auto RealType = SILTy.getASTType();
   auto DbgTy = DebugTypeInfo::getLocalVariable(Decl, RealType, type);
 
-  bindArchetypes(RealType);
+  bindArchetypes(DbgTy.getType());
   if (IGM.DebugInfo)
     emitDebugVariableDeclaration(addr, DbgTy, SILTy, DS, Decl, *VarInfo,
                                  Indirection);