diff --git a/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp b/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
--- a/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
+++ b/llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
@@ -2372,7 +2372,8 @@
         // friends in the past, but modern versions do not.
       }
     } else if (auto *Composite = dyn_cast<DICompositeType>(Element)) {
-      Info.NestedTypes.push_back(Composite);
+      if (!Composite->getIdentifier().contains("<unnamed-type-"))
+        Info.NestedTypes.push_back(Composite);
     }
     // Skip other unrecognized kinds of elements.
   }
diff --git a/llvm/test/DebugInfo/COFF/nested-types.ll b/llvm/test/DebugInfo/COFF/nested-types.ll
--- a/llvm/test/DebugInfo/COFF/nested-types.ll
+++ b/llvm/test/DebugInfo/COFF/nested-types.ll
@@ -7,45 +7,115 @@
 ;   typedef int InnerTypedef;
 ;   enum { InnerEnumerator = 2 };
 ;   struct InnerStruct { };
+;   struct {
+;     int i1;
+;   } unnamed_struct;
+;   struct {
+;     int i2;
+;   };
+;   union {
+;     int i3;
+;   } unnamed_union;
+;   union {
+;     int i4;
+;   };
 ; };
 ; HasNested f;
-; $ clang t.cpp -S -emit-llvm -g -gcodeview -o t.ll
+; $ clang-cl -c t.cpp /Z7 -Xclang -emit-llvm -o t.ll
 
 ; ModuleID = 't.cpp'
 source_filename = "t.cpp"
-target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-pc-windows-msvc19.0.24215"
+target datalayout = "e-m:w-p270:32:32-p271:32:32-p272:64:64-i64:64-f80:128-n8:16:32:64-S128"
+target triple = "x86_64-pc-windows-msvc19.20.0"
 
-%struct.HasNested = type { i8 }
+%struct.HasNested = type { %struct.anon, %struct.anon.0, %union.anon, %union.anon.1 }
+%struct.anon = type { i32 }
+%struct.anon.0 = type { i32 }
+%union.anon = type { i32 }
+%union.anon.1 = type { i32 }
 
-@"\01?f@@3UHasNested@@A" = global %struct.HasNested zeroinitializer, align 1, !dbg !0
+@"?f@@3UHasNested@@A" = dso_local global %struct.HasNested zeroinitializer, align 4, !dbg !0
 
 !llvm.dbg.cu = !{!2}
-!llvm.module.flags = !{!17, !18, !19, !20}
-!llvm.ident = !{!21}
+!llvm.linker.options = !{!33, !34}
+!llvm.module.flags = !{!35, !36, !37, !38, !39}
+!llvm.ident = !{!40}
 
 !0 = !DIGlobalVariableExpression(var: !1, expr: !DIExpression())
-!1 = distinct !DIGlobalVariable(name: "f", linkageName: "\01?f@@3UHasNested@@A", scope: !2, file: !3, line: 7, type: !6, isLocal: false, isDefinition: true)
-!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !3, producer: "clang version 6.0.0 ", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !16)
-!3 = !DIFile(filename: "t.cpp", directory: "C:\5Csrc\5Cllvm-project\5Cbuild", checksumkind: CSK_MD5, checksum: "40c412b85e2b27acb30eef53983b1da4")
+!1 = distinct !DIGlobalVariable(name: "f", linkageName: "?f@@3UHasNested@@A", scope: !2, file: !3, line: 19, type: !6, isLocal: false, isDefinition: true)
+!2 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !3, producer: "clang version 16.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !4, globals: !32, splitDebugInlining: false, nameTableKind: None)
+!3 = !DIFile(filename: "t.cpp", directory: "/usr/local/google/home/zequanwu/llvm-project/build/test", checksumkind: CSK_MD5, checksum: "8d2810093b6f0e47f35a569b40160b89")
 !4 = !{!5, !10}
-!5 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "InnerEnum", scope: !6, file: !3, line: 2, baseType: !9, size: 32, elements: !14, identifier: ".?AW4InnerEnum@HasNested@@")
-!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "HasNested", file: !3, line: 1, size: 8, elements: !7, identifier: ".?AUHasNested@@")
-!7 = !{!5, !8, !10, !13}
+!5 = !DICompositeType(tag: DW_TAG_enumeration_type, name: "InnerEnum", scope: !6, file: !3, line: 2, baseType: !9, size: 32, elements: !30, identifier: ".?AW4InnerEnum@HasNested@@")
+!6 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "HasNested", file: !3, line: 1, size: 128, flags: DIFlagTypePassByValue, elements: !7, identifier: ".?AUHasNested@@")
+!7 = !{!5, !8, !10, !13, !14, !17, !18, !21, !22, !25, !26, !29}
 !8 = !DIDerivedType(tag: DW_TAG_typedef, name: "InnerTypedef", scope: !6, file: !3, line: 3, baseType: !9)
 !9 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
 !10 = !DICompositeType(tag: DW_TAG_enumeration_type, scope: !6, file: !3, line: 4, baseType: !9, size: 32, elements: !11, identifier: ".?AW4<unnamed-enum-InnerEnumerator>@HasNested@@")
 !11 = !{!12}
 !12 = !DIEnumerator(name: "InnerEnumerator", value: 2)
-!13 = !DICompositeType(tag: DW_TAG_structure_type, name: "InnerStruct", scope: !6, file: !3, line: 5, flags: DIFlagFwdDecl, identifier: ".?AUInnerStruct@HasNested@@")
-!14 = !{!15}
-!15 = !DIEnumerator(name: "_BUF_SIZE", value: 1)
-!16 = !{!0}
-!17 = !{i32 2, !"CodeView", i32 1}
-!18 = !{i32 2, !"Debug Info Version", i32 3}
-!19 = !{i32 1, !"wchar_size", i32 2}
-!20 = !{i32 7, !"PIC Level", i32 2}
-!21 = !{!"clang version 6.0.0 "}
+!13 = !DICompositeType(tag: DW_TAG_structure_type, name: "InnerStruct", scope: !6, file: !3, line: 5, size: 8, flags: DIFlagFwdDecl, identifier: ".?AUInnerStruct@HasNested@@")
+!14 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "<unnamed-type-unnamed_struct>", scope: !6, file: !3, line: 6, size: 32, flags: DIFlagTypePassByValue, elements: !15, identifier: ".?AU<unnamed-type-unnamed_struct>@HasNested@@")
+!15 = !{!16}
+!16 = !DIDerivedType(tag: DW_TAG_member, name: "i1", scope: !14, file: !3, line: 7, baseType: !9, size: 32)
+!17 = !DIDerivedType(tag: DW_TAG_member, name: "unnamed_struct", scope: !6, file: !3, line: 8, baseType: !14, size: 32)
+!18 = distinct !DICompositeType(tag: DW_TAG_structure_type, scope: !6, file: !3, line: 9, size: 32, flags: DIFlagExportSymbols | DIFlagTypePassByValue, elements: !19, identifier: ".?AU<unnamed-type-$S1>@HasNested@@")
+!19 = !{!20}
+!20 = !DIDerivedType(tag: DW_TAG_member, name: "i2", scope: !18, file: !3, line: 10, baseType: !9, size: 32)
+!21 = !DIDerivedType(tag: DW_TAG_member, scope: !6, file: !3, line: 9, baseType: !18, size: 32, offset: 32)
+!22 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "<unnamed-type-unnamed_union>", scope: !6, file: !3, line: 12, size: 32, flags: DIFlagTypePassByValue, elements: !23, identifier: ".?AT<unnamed-type-unnamed_union>@HasNested@@")
+!23 = !{!24}
+!24 = !DIDerivedType(tag: DW_TAG_member, name: "i3", scope: !22, file: !3, line: 13, baseType: !9, size: 32)
+!25 = !DIDerivedType(tag: DW_TAG_member, name: "unnamed_union", scope: !6, file: !3, line: 14, baseType: !22, size: 32, offset: 64)
+!26 = distinct !DICompositeType(tag: DW_TAG_union_type, scope: !6, file: !3, line: 15, size: 32, flags: DIFlagExportSymbols | DIFlagTypePassByValue, elements: !27, identifier: ".?AT<unnamed-type-$S2>@HasNested@@")
+!27 = !{!28}
+!28 = !DIDerivedType(tag: DW_TAG_member, name: "i4", scope: !26, file: !3, line: 16, baseType: !9, size: 32)
+!29 = !DIDerivedType(tag: DW_TAG_member, scope: !6, file: !3, line: 15, baseType: !26, size: 32, offset: 96)
+!30 = !{!31}
+!31 = !DIEnumerator(name: "_BUF_SIZE", value: 1)
+!32 = !{!0}
+!33 = !{!"/DEFAULTLIB:libcmt.lib"}
+!34 = !{!"/DEFAULTLIB:oldnames.lib"}
+!35 = !{i32 2, !"CodeView", i32 1}
+!36 = !{i32 2, !"Debug Info Version", i32 3}
+!37 = !{i32 1, !"wchar_size", i32 2}
+!38 = !{i32 8, !"PIC Level", i32 2}
+!39 = !{i32 7, !"uwtable", i32 2}
+!40 = !{!"clang version 16.0.0"}
+
+
+; CHECK: Struct ({{0x.*}}) {
+; CHECK: LinkageName: .?AUHasNested@@
+
+; CHECK:      Struct ([[UNNAMED_STRUCT_FORWARD:0x.*]]) {
+; CHECK-NEXT:   TypeLeafKind: LF_STRUCTURE (0x1505)
+; CHECK-NEXT:   MemberCount: 0
+; CHECK-NEXT:   Properties [ (0x288)
+; CHECK-NEXT:     ForwardReference (0x80)
+; CHECK-NEXT:     HasUniqueName (0x200)
+; CHECK-NEXT:     Nested (0x8)
+; CHECK-NEXT:   ]
+; CHECK-NEXT:   FieldList: 0x0
+; CHECK-NEXT:   DerivedFrom: 0x0
+; CHECK-NEXT:   VShape: 0x0
+; CHECK-NEXT:   SizeOf: 0
+; CHECK-NEXT:   Name: HasNested::<unnamed-type-unnamed_struct>
+; CHECK-NEXT:   LinkageName: .?AU<unnamed-type-unnamed_struct>@HasNested@@
+; CHECK-NEXT: }
+
+; CHECK:      Union ([[UNNAMED_UNION_FORWARD:0x.*]]) {
+; CHECK-NEXT:   TypeLeafKind: LF_UNION (0x1506)
+; CHECK-NEXT:   MemberCount: 0
+; CHECK-NEXT:   Properties [ (0x288)
+; CHECK-NEXT:     ForwardReference (0x80)
+; CHECK-NEXT:     HasUniqueName (0x200)
+; CHECK-NEXT:     Nested (0x8)
+; CHECK-NEXT:   ]
+; CHECK-NEXT:   FieldList: 0x0
+; CHECK-NEXT:   SizeOf: 0
+; CHECK-NEXT:   Name: HasNested::<unnamed-type-unnamed_union>
+; CHECK-NEXT:   LinkageName: .?AT<unnamed-type-unnamed_union>@HasNested@@
+; CHECK-NEXT: }
 
 ; InnerEnum:
 
@@ -113,6 +183,34 @@
 
 ; CHECK:      FieldList ([[HASNESTED_MEMBERS:0x.*]]) {
 ; CHECK-NEXT:   TypeLeafKind: LF_FIELDLIST (0x1203)
+; CHECK-NEXT:   DataMember {
+; CHECK-NEXT:     TypeLeafKind: LF_MEMBER (0x150D)
+; CHECK-NEXT:     AccessSpecifier: Public (0x3)
+; CHECK-NEXT:     Type: HasNested::<unnamed-type-unnamed_struct> ([[UNNAMED_STRUCT_FORWARD]])
+; CHECK-NEXT:     FieldOffset: 0x0
+; CHECK-NEXT:     Name: unnamed_struct
+; CHECK-NEXT:   }
+; CHECK-NEXT:   DataMember {
+; CHECK-NEXT:     TypeLeafKind: LF_MEMBER (0x150D)
+; CHECK-NEXT:     AccessSpecifier: Public (0x3)
+; CHECK-NEXT:     Type: int (0x74)
+; CHECK-NEXT:     FieldOffset: 0x4
+; CHECK-NEXT:     Name: i2
+; CHECK-NEXT:   }
+; CHECK-NEXT:   DataMember {
+; CHECK-NEXT:     TypeLeafKind: LF_MEMBER (0x150D)
+; CHECK-NEXT:     AccessSpecifier: Public (0x3)
+; CHECK-NEXT:     Type: HasNested::<unnamed-type-unnamed_union> ([[UNNAMED_UNION_FORWARD]])
+; CHECK-NEXT:     FieldOffset: 0x8
+; CHECK-NEXT:     Name: unnamed_union
+; CHECK-NEXT:   }
+; CHECK-NEXT:   DataMember {
+; CHECK-NEXT:     TypeLeafKind: LF_MEMBER (0x150D)
+; CHECK-NEXT:     AccessSpecifier: Public (0x3)
+; CHECK-NEXT:     Type: int (0x74)
+; CHECK-NEXT:     FieldOffset: 0xC
+; CHECK-NEXT:     Name: i4
+; CHECK-NEXT:   }
 ; CHECK-NEXT:   NestedType {
 ; CHECK-NEXT:     TypeLeafKind: LF_NESTTYPE (0x1510)
 ; CHECK-NEXT:     Type: HasNested::InnerEnum ([[INNERENUM]])
@@ -137,7 +235,7 @@
 ;
 ; CHECK:      Struct (0x{{.*}}) {
 ; CHECK-NEXT:   TypeLeafKind: LF_STRUCTURE (0x1505)
-; CHECK-NEXT:   MemberCount: 4
+; CHECK-NEXT:   MemberCount: 8
 ; CHECK-NEXT:   Properties [ (0x210)
 ; CHECK-NEXT:     ContainsNestedClass (0x10)
 ; CHECK-NEXT:     HasUniqueName (0x200)
@@ -145,7 +243,58 @@
 ; CHECK-NEXT:   FieldList: <field list> ([[HASNESTED_MEMBERS]])
 ; CHECK-NEXT:   DerivedFrom: 0x0
 ; CHECK-NEXT:   VShape: 0x0
-; CHECK-NEXT:   SizeOf: 1
+; CHECK-NEXT:   SizeOf: 16
 ; CHECK-NEXT:   Name: HasNested
 ; CHECK-NEXT:   LinkageName: .?AUHasNested@@
 ; CHECK-NEXT: }
+
+; CHECK:      FieldList ([[UNNAMED_STRUCT_MEMBERS:0x.*]]) {
+; CHECK-NEXT:   TypeLeafKind: LF_FIELDLIST (0x1203)
+; CHECK-NEXT:   DataMember {
+; CHECK-NEXT:     TypeLeafKind: LF_MEMBER (0x150D)
+; CHECK-NEXT:     AccessSpecifier: Public (0x3)
+; CHECK-NEXT:     Type: int (0x74)
+; CHECK-NEXT:     FieldOffset: 0x0
+; CHECK-NEXT:     Name: i1
+; CHECK-NEXT:   }
+; CHECK-NEXT: }
+
+; CHECK:      Struct (0x{{.*}}) {
+; CHECK-NEXT:   TypeLeafKind: LF_STRUCTURE (0x1505)
+; CHECK-NEXT:   MemberCount: 1
+; CHECK-NEXT:   Properties [ (0x208)
+; CHECK-NEXT:     HasUniqueName (0x200)
+; CHECK-NEXT:     Nested (0x8)
+; CHECK-NEXT:   ]
+; CHECK-NEXT:   FieldList: <field list> ([[UNNAMED_STRUCT_MEMBERS]])
+; CHECK-NEXT:   DerivedFrom: 0x0
+; CHECK-NEXT:   VShape: 0x0
+; CHECK-NEXT:   SizeOf: 4
+; CHECK-NEXT:   Name: HasNested::<unnamed-type-unnamed_struct>
+; CHECK-NEXT:   LinkageName: .?AU<unnamed-type-unnamed_struct>@HasNested@@
+; CHECK-NEXT: }
+
+; CHECK:      FieldList ([[UNNAMED_UNION_MEMBERS:0x.*]]) {
+; CHECK-NEXT:   TypeLeafKind: LF_FIELDLIST (0x1203)
+; CHECK-NEXT:   DataMember {
+; CHECK-NEXT:     TypeLeafKind: LF_MEMBER (0x150D)
+; CHECK-NEXT:     AccessSpecifier: Public (0x3)
+; CHECK-NEXT:     Type: int (0x74)
+; CHECK-NEXT:     FieldOffset: 0x0
+; CHECK-NEXT:     Name: i3
+; CHECK-NEXT:   }
+; CHECK-NEXT: }
+
+; CHECK:      Union (0x{{.*}}) {
+; CHECK-NEXT:   TypeLeafKind: LF_UNION (0x1506)
+; CHECK-NEXT:   MemberCount: 1
+; CHECK-NEXT:   Properties [ (0x608)
+; CHECK-NEXT:     HasUniqueName (0x200)
+; CHECK-NEXT:     Nested (0x8)
+; CHECK-NEXT:     Sealed (0x400)
+; CHECK-NEXT:   ]
+; CHECK-NEXT:   FieldList: <field list> ([[UNNAMED_UNION_MEMBERS]])
+; CHECK-NEXT:   SizeOf: 4
+; CHECK-NEXT:   Name: HasNested::<unnamed-type-unnamed_union>
+; CHECK-NEXT:   LinkageName: .?AT<unnamed-type-unnamed_union>@HasNested@@
+; CHECK-NEXT: }