Debug Info: Unify the handling of indirect values and fix a bug where

ParenTypes were not recognized as generic.

Fixes rdar://problem/23681035

Author: adrian-prantl

lib/IRGen/IRGenDebugInfo.cpp

@@ -1000,6 +1000,12 @@ void IRGenDebugInfo::emitVariableDeclaration(
   if (Artificial || DITy->isArtificial() || DITy == InternalType)
     Flags |= llvm::DINode::FlagArtificial;
 
+  // LValues, inout args, and Archetypes are implicitly indirect by
+  // virtue of their DWARF type.
+  if (DbgTy.getType()->getKind() == TypeKind::InOut ||
+      DbgTy.getType()->hasArchetype())
+    Indirection = DirectValue;
+
   // Create the descriptor for the variable.
   llvm::DILocalVariable *Var = nullptr;
 

lib/IRGen/IRGenSIL.cpp

@@ -2957,17 +2957,6 @@ void IRGenSILFunction::visitDebugValueInst(DebugValueInst *i) {
                                i->getVarInfo().getArgNo());
 }
 
-/// InOut- and Archetypes are already implicitly indirect.
-static IndirectionKind getIndirectionForDebugValueAddr(swift::TypeBase *Ty) {
-  switch (Ty->getKind()) {
-  case TypeKind::InOut:
-  case TypeKind::Archetype:
-    return DirectValue;
-  default:
-    return IndirectValue;
-  }
-}
-
 void IRGenSILFunction::visitDebugValueAddrInst(DebugValueAddrInst *i) {
   if (!IGM.DebugInfo)
     return;
@@ -2983,10 +2972,9 @@ void IRGenSILFunction::visitDebugValueAddrInst(DebugValueAddrInst *i) {
   auto Addr = getLoweredAddress(SILVal).getAddress();
   DebugTypeInfo DbgTy(Decl, Decl->getType(), getTypeInfo(SILVal.getType()));
   // Put the value into a stack slot at -Onone and emit a debug intrinsic.
-  emitDebugVariableDeclaration(
-      emitShadowCopy(Addr, Name), DbgTy, i->getDebugScope(), Name,
-      i->getVarInfo().getArgNo(),
-      getIndirectionForDebugValueAddr(DbgTy.getType()));
+  emitDebugVariableDeclaration(emitShadowCopy(Addr, Name), DbgTy,
+                               i->getDebugScope(), Name,
+                               i->getVarInfo().getArgNo(), IndirectValue);
 }
 
 void IRGenSILFunction::visitLoadWeakInst(swift::LoadWeakInst *i) {
@@ -3400,16 +3388,11 @@ void IRGenSILFunction::visitAllocBoxInst(swift::AllocBoxInst *i) {
     // arguments.
     if (Name == IGM.Context.Id_self.str())
       return;
-    auto Indirection = IndirectValue;
-    // LValues and inout args are implicitly indirect because of their type.
-    if (Decl->getType()->getKind() == TypeKind::LValue ||
-        Decl->getType()->getKind() == TypeKind::InOut)
-      Indirection = DirectValue;
 
     IGM.DebugInfo->emitVariableDeclaration(
         Builder, emitShadowCopy(addr.getAddress(), Name),
         DebugTypeInfo(Decl, i->getElementType().getSwiftType(), type),
-        i->getDebugScope(), Name, 0, Indirection);
+        i->getDebugScope(), Name, 0, IndirectValue);
   }
 }
 

test/DebugInfo/generic_arg3.swift

@@ -0,0 +1,16 @@
+// RUN: %target-swift-frontend %s -emit-ir -g -o - | FileCheck %s
+
+func apply<Type>(T : Type, fn: (Type) -> Type) -> Type { return fn(T) }
+
+public func f<Type>(value : Type)
+{
+  // CHECK: define {{.*}}_TFF12generic_arg31furFxT_U_FQ_Q_
+  // CHECK: store %swift.opaque* %1, %swift.opaque** %[[ALLOCA:.*]], align
+  // CHECK: call void @llvm.dbg.declare(metadata %swift.opaque** %[[ALLOCA]],
+  // CHECK-SAME:       metadata ![[ARG:.*]], metadata ![[EXPR:.*]])
+  // A generic argument is implictly indirect and should not be dereferenced.
+  // CHECK: ![[EXPR]] = !DIExpression()
+  // CHECK: ![[ARG]] = !DILocalVariable(name: "arg", arg: 1,
+  // CHECK-SAME:     line: [[@LINE+1]], type: !"_TtQq_F12generic_arg31furFxT_")
+  apply(value) { arg in return arg }
+}