diff --git a/clang/lib/CodeGen/CGDebugInfo.cpp b/clang/lib/CodeGen/CGDebugInfo.cpp
index 4d1b0b65d6e8..576a97b66859 100644
--- a/clang/lib/CodeGen/CGDebugInfo.cpp
+++ b/clang/lib/CodeGen/CGDebugInfo.cpp
@@ -2930,6 +2930,9 @@ llvm::DIType *CGDebugInfo::CreateTypeDefinition(const ObjCInterfaceType *Ty,
     else if (Field->getAccessControl() == ObjCIvarDecl::Public)
       Flags = llvm::DINode::FlagPublic;
 
+    if (Field->isBitField())
+      Flags |= llvm::DINode::FlagBitField;
+
     llvm::MDNode *PropertyNode = nullptr;
     if (ObjCImplementationDecl *ImpD = ID->getImplementation()) {
       if (ObjCPropertyImplDecl *PImpD =
diff --git a/clang/test/CodeGenObjC/debug-info-ivars.m b/clang/test/CodeGenObjC/debug-info-ivars.m
index 996562dae25f..dc253b2c58ab 100644
--- a/clang/test/CodeGenObjC/debug-info-ivars.m
+++ b/clang/test/CodeGenObjC/debug-info-ivars.m
@@ -30,15 +30,15 @@ __attribute((objc_root_class)) @interface NSObject {
 // CHECK-SAME:           baseType: ![[UNSIGNED:[0-9]+]]
 // CHECK-SAME:           size: 9,
 // CHECK-NOT:            offset:
-// CHECK-SAME:           flags: DIFlagProtected
+// CHECK-SAME:           flags: DIFlagProtected | DIFlagBitField
 // CHECK: ![[UNSIGNED]] = !DIBasicType(name: "unsigned int"
 // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "flag_2"
 // CHECK-SAME:           line: 12
 // CHECK-SAME:           baseType: ![[UNSIGNED]]
 // CHECK-SAME:           size: 9, offset: 1,
-// CHECK-SAME:           flags: DIFlagProtected
+// CHECK-SAME:           flags: DIFlagProtected | DIFlagBitField
 // CHECK: !DIDerivedType(tag: DW_TAG_member, name: "flag_3"
 // CHECK-SAME:           line: 14
 // CHECK-SAME:           baseType: ![[UNSIGNED]]
 // CHECK-SAME:           size: 9, offset: 3,
-// CHECK-SAME:           flags: DIFlagProtected
+// CHECK-SAME:           flags: DIFlagProtected | DIFlagBitField