Merge pull request #25468 from adrian-prantl/51343998-swift-5.1-branch-06-12-2019

Remove a workaround in the debug info handling of zero-sized types.

Author: adrian-prantl

lib/IRGen/IRGenDebugInfo.cpp

@@ -2182,11 +2182,6 @@ void IRGenDebugInfoImpl::emitVariableDeclaration(
     if (Indirection)
       Operands.push_back(llvm::dwarf::DW_OP_deref);
 
-    // There are variables without storage, such as "struct { func foo() {}
-    // }". Emit them as constant 0.
-    if (isa<llvm::UndefValue>(Piece))
-      Piece = llvm::ConstantInt::get(IGM.Int64Ty, 0);
-
     if (IsPiece) {
       // Advance the offset and align it for the next piece.
       OffsetInBits += llvm::alignTo(SizeInBits, AlignInBits);

test/DebugInfo/nostorage.swift

@@ -25,8 +25,8 @@ struct AStruct {}
 
 // CHECK2: define{{.*}}app
 public func app() {
-  // No members? No storage! Emitted as a constant 0, because.
-  // CHECK2: call void @llvm.dbg.value(metadata i{{.*}} 0,
+  // No members? No storage!
+  // CHECK2: call void @llvm.dbg.value(metadata {{.*}}* undef,
   // CHECK2-SAME:                      metadata ![[AT:.*]], metadata
   // CHECK2: ![[AT]] = !DILocalVariable(name: "at",{{.*}}line: [[@LINE+1]]
   var at = AStruct()