Remove wrapper functions that added little value. (NFC)

Author: adrian-prantl

lib/IRGen/IRGenDebugInfo.cpp

@@ -863,26 +863,6 @@ void IRGenDebugInfo::emitTypeMetadata(IRGenFunction &IGF,
                           DirectValue, ArtificialValue);
 }
 
-void IRGenDebugInfo::emitStackVariableDeclaration(
-    IRBuilder &B, ArrayRef<llvm::Value *> Storage, DebugTypeInfo DbgTy,
-    const SILDebugScope *DS, StringRef Name, IndirectionKind Indirection) {
-  emitVariableDeclaration(B, Storage, DbgTy, DS, Name, 0, Indirection,
-                          RealValue);
-}
-
-void IRGenDebugInfo::emitArgVariableDeclaration(
-    IRBuilder &Builder, ArrayRef<llvm::Value *> Storage, DebugTypeInfo DbgTy,
-    const SILDebugScope *DS, StringRef Name, unsigned ArgNo,
-    IndirectionKind Indirection, ArtificialKind IsArtificial) {
-  assert(ArgNo > 0);
-  if (Name == IGM.Context.Id_self.str())
-    emitVariableDeclaration(Builder, Storage, DbgTy, DS, Name, ArgNo,
-                            DirectValue, ArtificialValue);
-  else
-    emitVariableDeclaration(Builder, Storage, DbgTy, DS, Name, ArgNo,
-                            Indirection, IsArtificial);
-}
-
 /// Return the DIFile that is the ancestor of Scope.
 llvm::DIFile *IRGenDebugInfo::getFile(llvm::DIScope *Scope) {
   while (!isa<llvm::DIFile>(Scope)) {
@@ -985,6 +965,10 @@ void IRGenDebugInfo::emitVariableDeclaration(
     IRBuilder &Builder, ArrayRef<llvm::Value *> Storage, DebugTypeInfo DbgTy,
     const SILDebugScope *DS, StringRef Name, unsigned ArgNo,
     IndirectionKind Indirection, ArtificialKind Artificial) {
+  // Self is always an artificial argument.
+  if (ArgNo > 0 && Name == IGM.Context.Id_self.str())
+    Artificial = ArtificialValue;
+
   // FIXME: Make this an assertion.
   // assert(DS && "variable has no scope");
   if (!DS)

lib/IRGen/IRGenDebugInfo.h

@@ -201,22 +201,6 @@ class IRGenDebugInfo {
                                IndirectionKind = DirectValue,
                                ArtificialKind = RealValue);
 
-  /// Convenience function for stack-allocated variables. Calls
-  /// emitVariableDeclaration internally.
-  void emitStackVariableDeclaration(IRBuilder &Builder,
-                                    ArrayRef<llvm::Value *> Storage,
-                                    DebugTypeInfo Ty, const SILDebugScope *DS,
-                                    StringRef Name,
-                                    IndirectionKind Indirection = DirectValue);
-
-  /// Convenience function for variables that are function arguments.
-  void emitArgVariableDeclaration(IRBuilder &Builder,
-                                  ArrayRef<llvm::Value *> Storage,
-                                  DebugTypeInfo Ty, const SILDebugScope *DS,
-                                  StringRef Name, unsigned ArgNo,
-                                  IndirectionKind = DirectValue,
-                                  ArtificialKind = RealValue);
-
   /// Emit a dbg.declare or dbg.value intrinsic, depending on Storage.
   void emitDbgIntrinsic(llvm::BasicBlock *BB, llvm::Value *Storage,
                         llvm::DILocalVariable *Var, llvm::DIExpression *Expr,

lib/IRGen/IRGenSIL.cpp

@@ -553,11 +553,11 @@ class IRGenSILFunction :
     assert(IGM.DebugInfo && "debug info not enabled");
     if (ArgNo) {
       PrologueLocation AutoRestore(IGM.DebugInfo, Builder);
-      IGM.DebugInfo->emitArgVariableDeclaration(Builder, Storage, Ty, DS, Name,
-                                                ArgNo, Indirection);
+      IGM.DebugInfo->emitVariableDeclaration(Builder, Storage, Ty, DS, Name,
+                                             ArgNo, Indirection);
     } else
-      IGM.DebugInfo->emitStackVariableDeclaration(Builder, Storage, Ty, DS,
-                                                  Name, Indirection);
+      IGM.DebugInfo->emitVariableDeclaration(Builder, Storage, Ty, DS, Name, 0,
+                                             Indirection);
   }
 
   void emitFailBB() {
@@ -1424,10 +1424,9 @@ void IRGenSILFunction::emitFunctionArgDebugInfo(SILBasicBlock *BB) {
     // other argument. It is only used for sorting.
     unsigned ArgNo =
         countArgs(CurSILFn->getDeclContext()) + 1 + BB->getBBArgs().size();
-    IGM.DebugInfo->emitArgVariableDeclaration(
+    IGM.DebugInfo->emitVariableDeclaration(
         Builder, emitShadowCopy(ErrorResultSlot.getAddress(), Name), DTI,
-        getDebugScope(), Name, ArgNo,
-        IndirectValue, ArtificialValue);
+        getDebugScope(), Name, ArgNo, IndirectValue, ArtificialValue);
   }
 }
 
@@ -3431,11 +3430,10 @@ void IRGenSILFunction::visitAllocBoxInst(swift::AllocBoxInst *i) {
         Decl->getType()->getKind() == TypeKind::InOut)
       Indirection = DirectValue;
 
-    IGM.DebugInfo->emitStackVariableDeclaration
-      (Builder,
-       emitShadowCopy(addr.getAddress(), Name),
-       DebugTypeInfo(Decl, i->getElementType().getSwiftType(), type),
-       i->getDebugScope(), Name, Indirection);
+    IGM.DebugInfo->emitVariableDeclaration(
+        Builder, emitShadowCopy(addr.getAddress(), Name),
+        DebugTypeInfo(Decl, i->getElementType().getSwiftType(), type),
+        i->getDebugScope(), Name, 0, Indirection);
   }
 }