---

yaml
---
r: 348114
b: refs/heads/master
c: 1bf7d48
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 5e5f662fb7ab1a342a34efed579e590bb3097db7
+refs/heads/master: 1bf7d48111a10a57c8344281df58346bb1e61bd5
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/IRGen/IRGenDebugInfo.cpp

@@ -2169,11 +2169,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);

trunk/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()