diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index a5e9e4e092e6..563faa4f7804 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1379,7 +1379,12 @@ llvm::DIType CGDebugInfo::getOrCreateInterfaceType(QualType D,
 /// CreateType - get structure or union type.
 llvm::DIType CGDebugInfo::CreateType(const RecordType *Ty, bool Declaration) {
   RecordDecl *RD = Ty->getDecl();
+  // Limited debug info should only remove struct definitions that can
+  // safely be replaced by a forward declaration in the source code.
   if (DebugKind <= CodeGenOptions::LimitedDebugInfo && Declaration) {
+    // FIXME: This implementation is problematic; there are some test
+    // cases where we violate the above principle, such as
+    // test/CodeGen/debug-info-records.c .
     llvm::DIDescriptor FDContext =
       getContextDescriptor(cast<Decl>(RD->getDeclContext()));
     llvm::DIType RetTy = createRecordFwdDecl(RD, FDContext);
diff --git a/clang/test/CodeGen/debug-info-record.c b/clang/test/CodeGen/debug-info-record.c
index 01e3c109880e..55927ca667ae 100644
--- a/clang/test/CodeGen/debug-info-record.c
+++ b/clang/test/CodeGen/debug-info-record.c
@@ -3,7 +3,9 @@
 // rdar://problem/14101097
 //
 // FIXME: This should work with -flimit-debug-info, too.
-//
+
+// Make sure this is not a forward declaration.
+// CHECK-NOT: [ DW_TAG_structure_type ] [elusive_s] {{.*}} [fwd]
 // CHECK: [ DW_TAG_member ] [foo]
 // CHECK: [ DW_TAG_member ] [bar]
 struct elusive_s {
@@ -16,4 +18,3 @@ int baz(void* x) {
   elusive_t s = x;
   return s->foo;
 }
-