akhuang created this revision.
akhuang added reviewers: rnk, asmith.
Herald added subscribers: llvm-commits, cfe-commits, hiraditya.
Herald added projects: clang, LLVM.
This change checks for the return type in the frontend and adds a flag
to the DISubroutineType to indicate that the option should be added in
CodeViewDebug.
Previously function types sometimes appeared twice in the PDB: once with
"returns cxx udt" and once without.
See https://bugs.llvm.org/show_bug.cgi?id=44785.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D75215
Files:
clang/lib/CodeGen/CGDebugInfo.cpp
clang/test/CodeGenCXX/debug-info-return-udt.cpp
llvm/include/llvm/IR/DebugInfoFlags.def
llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
llvm/test/DebugInfo/COFF/function-options.ll
Index: llvm/test/DebugInfo/COFF/function-options.ll
===================================================================
--- llvm/test/DebugInfo/COFF/function-options.ll
+++ llvm/test/DebugInfo/COFF/function-options.ll
@@ -17,24 +17,12 @@
; };
; DEFINE_FUNCTION(BClass); // Expect: FO = CxxReturnUdt
;
-; class C1Class {
-; public:
-; C1Class() = default; // Note: Clang generates one defaulted ctor (FO = None) while MSVC doesn't.
+; class CClass {
+; AClass Member_AClass(AClass &); // Expect: FO = CxxReturnUdt
+; BClass Member_BClass(BClass &); // Expect: FO = CxxReturnUdt
; };
-; DEFINE_FUNCTION(C1Class); // Expect: FO = None
+; DEFINE_FUNCTION(CClass);
;
-; class C2Class { // Note: MSVC-specific dtor, i.e. __vecDelDtor won't be verified in this case.
-; public:
-; ~C2Class() {} // Expect ~C2Class: FO = None
-; };
-; DEFINE_FUNCTION(C2Class); // Expect: FO = CxxReturnUdt
-;
-; class DClass : public BClass {}; // Note: MSVC yields one compiler-generated ctor for DClass while clang doesn't.
-; DEFINE_FUNCTION(DClass); // Expect: FO = CxxReturnUdt
-;
-; class FClass { static int x; };
-; DEFINE_FUNCTION(FClass); // Expect FO = None
-;
; struct AStruct {};
; DEFINE_FUNCTION(AStruct); // Expect FO = None
;
@@ -54,7 +42,7 @@
; CHECK: CodeViewTypes [
; CHECK: Section: .debug$T ({{.*}})
; CHECK: Magic: 0x4
-; CHECK: Procedure ([[SP1:.*]]) {
+; CHECK: Procedure ([[SP_A:.*]]) {
; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
; CHECK: ReturnType: AClass ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
@@ -66,10 +54,10 @@
; CHECK: FuncId ({{.*}}) {
; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: AClass (AClass&) ([[SP1]])
+; CHECK: FunctionType: AClass (AClass&) ([[SP_A]])
; CHECK: Name: Func_AClass
; CHECK: }
-; CHECK: Procedure ([[SP2:.*]]) {
+; CHECK: Procedure ([[SP_B:.*]]) {
; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
; CHECK: ReturnType: BClass ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
@@ -104,132 +92,66 @@
; CHECK: FuncId ({{.*}}) {
; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: BClass (BClass&) ([[SP2]])
+; CHECK: FunctionType: BClass (BClass&) ([[SP_B]])
; CHECK: Name: Func_BClass
; CHECK: }
-; CHECK: Procedure ([[SP3:.*]]) {
+; CHECK: Procedure ([[SP_C:.*]]) {
; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
-; CHECK: ReturnType: C1Class ({{.*}})
+; CHECK: ReturnType: CClass ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
; CHECK: FunctionOptions [ (0x0)
; CHECK: ]
; CHECK: NumParameters: 1
-; CHECK: ArgListType: (C1Class&) ({{.*}})
-; CHECK: }
-; CHECK: MemberFunction ([[MF2:.*]]) {
-; CHECK: TypeLeafKind: LF_MFUNCTION (0x1009)
-; CHECK: ReturnType: void (0x3)
-; CHECK: ClassType: C1Class ({{.*}})
-; CHECK: ThisType: C1Class* const ({{.*}})
-; CHECK: CallingConvention: NearC (0x0)
-; CHECK: FunctionOptions [ (0x0)
-; CHECK: ]
-; CHECK: NumParameters: 0
-; CHECK: ArgListType: () ({{.*}})
-; CHECK: ThisAdjustment: 0
-; CHECK: }
-; CHECK: FieldList ({{.*}}) {
-; CHECK: TypeLeafKind: LF_FIELDLIST (0x1203)
-; CHECK: OneMethod {
-; CHECK: TypeLeafKind: LF_ONEMETHOD (0x1511)
-; CHECK: AccessSpecifier: Public (0x3)
-; CHECK: Type: void C1Class::() ([[MF2]])
-; CHECK: Name: C1Class
-; CHECK: }
-; CHECK: }
-; CHECK: FuncId ({{.*}}) {
-; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
-; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: C1Class (C1Class&) ([[SP3]])
-; CHECK: Name: Func_C1Class
-; CHECK: }
-; CHECK: Procedure ([[SP4:.*]]) {
-; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
-; CHECK: ReturnType: C2Class ({{.*}})
+; CHECK: ArgListType: (CClass&) (0x1016)
+; CHECK: }
+; CHECK: MemberFunction ([[MF_A:.*]]) {
+; CHECK: TypeLeafKind: LF_MFUNCTION ({{.*}})
+; CHECK: ReturnType: AClass ({{.*}})
+; CHECK: ClassType: CClass ({{.*}})
+; CHECK: ThisType: CClass* const ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
; CHECK: FunctionOptions [ (0x1)
; CHECK: CxxReturnUdt (0x1)
; CHECK: ]
; CHECK: NumParameters: 1
-; CHECK: ArgListType: (C2Class&) ({{.*}})
-; CHECK: }
-; CHECK: MemberFunction ([[MF3:.*]]) {
-; CHECK: TypeLeafKind: LF_MFUNCTION (0x1009)
-; CHECK: ReturnType: void (0x3)
-; CHECK: ClassType: C2Class ({{.*}})
-; CHECK: ThisType: C2Class* const ({{.*}})
-; CHECK: CallingConvention: NearC (0x0)
-; CHECK: FunctionOptions [ (0x0)
-; CHECK: ]
-; CHECK: NumParameters: 0
-; CHECK: ArgListType: () ({{.*}})
+; CHECK: ArgListType: (AClass&) ({{.*}})
; CHECK: ThisAdjustment: 0
; CHECK: }
-; CHECK: FieldList ({{.*}}) {
-; CHECK: TypeLeafKind: LF_FIELDLIST (0x1203)
-; CHECK: OneMethod {
-; CHECK: TypeLeafKind: LF_ONEMETHOD (0x1511)
-; CHECK: AccessSpecifier: Public (0x3)
-; CHECK: Type: void C2Class::() ([[MF3]])
-; CHECK: Name: ~C2Class
-; CHECK: }
-; CHECK: }
-; CHECK: FuncId ({{.*}}) {
-; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
-; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: C2Class (C2Class&) ([[SP4]])
-; CHECK: Name: Func_C2Class
-; CHECK: }
-; CHECK: Procedure ([[SP5:.*]]) {
-; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
-; CHECK: ReturnType: DClass ({{.*}})
+; CHECK: MemberFunction ([[MF_B:.*]]) {
+; CHECK: TypeLeafKind: LF_MFUNCTION (0x1009)
+; CHECK: ReturnType: BClass ({{.*}})
+; CHECK: ClassType: CClass ({{.*}}
+; CHECK: ThisType: CClass* const ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
; CHECK: FunctionOptions [ (0x1)
; CHECK: CxxReturnUdt (0x1)
; CHECK: ]
; CHECK: NumParameters: 1
-; CHECK: ArgListType: (DClass&) ({{.*}})
+; CHECK: ArgListType: (BClass&) ({{.*}})
+; CHECK: ThisAdjustment: 0
; CHECK: }
; CHECK: FieldList ({{.*}}) {
; CHECK: TypeLeafKind: LF_FIELDLIST (0x1203)
-; CHECK: BaseClass {
-; CHECK: TypeLeafKind: LF_BCLASS (0x1400)
-; CHECK: AccessSpecifier: Public (0x3)
-; CHECK: BaseType: BClass ({{.*}})
-; CHECK: BaseOffset: 0x0
+; CHECK: OneMethod {
+; CHECK: TypeLeafKind: LF_ONEMETHOD (0x1511)
+; CHECK: AccessSpecifier: Private (0x1)
+; CHECK: Type: AClass CClass::(AClass&) ([[MF_A]])
+; CHECK: Name: Member_AClass
; CHECK: }
-; CHECK: }
-; CHECK: FuncId ({{.*}}) {
-; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
-; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: DClass (DClass&) ([[SP5]])
-; CHECK: Name: Func_DClass
-; CHECK: }
-; CHECK: Procedure ([[SP6:.*]]) {
-; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
-; CHECK: ReturnType: FClass ({{.*}})
-; CHECK: CallingConvention: NearC (0x0)
-; CHECK: FunctionOptions [ (0x0)
-; CHECK: ]
-; CHECK: NumParameters: 1
-; CHECK: ArgListType: (FClass&) ({{.*}})
-; CHECK: }
-; CHECK: FieldList ({{.*}}) {
-; CHECK: TypeLeafKind: LF_FIELDLIST (0x1203)
-; CHECK: StaticDataMember {
-; CHECK: TypeLeafKind: LF_STMEMBER (0x150E)
+; CHECK: OneMethod {
+; CHECK: TypeLeafKind: LF_ONEMETHOD (0x1511)
; CHECK: AccessSpecifier: Private (0x1)
-; CHECK: Type: int (0x74)
-; CHECK: Name: x
+; CHECK: Type: BClass CClass::(BClass&) ([[MF_B]])
+; CHECK: Name: Member_BClass
; CHECK: }
; CHECK: }
; CHECK: FuncId ({{.*}}) {
; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: FClass (FClass&) ([[SP6]])
-; CHECK: Name: Func_FClass
+; CHECK: FunctionType: CClass (CClass&) ([[SP_C]])
+; CHECK: Name: Func_CClass
; CHECK: }
-; CHECK: Procedure ([[SP7:.*]]) {
+; CHECK: Procedure ([[SP_AS:.*]]) {
; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
; CHECK: ReturnType: AStruct ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
@@ -241,10 +163,10 @@
; CHECK: FuncId ({{.*}}) {
; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: AStruct (AStruct&) ([[SP7]])
+; CHECK: FunctionType: AStruct (AStruct&) ([[SP_AS]])
; CHECK: Name: Func_AStruct
; CHECK: }
-; CHECK: Procedure ([[SP8:.*]]) {
+; CHECK: Procedure ([[SP_BS:.*]]) {
; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
; CHECK: ReturnType: BStruct ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
@@ -279,10 +201,10 @@
; CHECK: FuncId ({{.*}}) {
; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: BStruct (BStruct&) ([[SP8]])
+; CHECK: FunctionType: BStruct (BStruct&) ([[SP_BS]])
; CHECK: Name: Func_BStruct
; CHECK: }
-; CHECK: Procedure ([[SP9:.*]]) {
+; CHECK: Procedure ([[SP_AU:.*]]) {
; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
; CHECK: ReturnType: AUnion ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
@@ -294,10 +216,10 @@
; CHECK: FuncId ({{.*}}) {
; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: AUnion (AUnion&) ([[SP9]])
+; CHECK: FunctionType: AUnion (AUnion&) ([[SP_AU]])
; CHECK: Name: Func_AUnion
; CHECK: }
-; CHECK: Procedure ([[SP10:.*]]) {
+; CHECK: Procedure ([[SP_BU:.*]]) {
; CHECK: TypeLeafKind: LF_PROCEDURE (0x1008)
; CHECK: ReturnType: BUnion ({{.*}})
; CHECK: CallingConvention: NearC (0x0)
@@ -306,7 +228,7 @@
; CHECK: NumParameters: 1
; CHECK: ArgListType: (BUnion&) ({{.*}})
; CHECK: }
-; CHECK: MemberFunction ([[MF5:.*]]) {
+; CHECK: MemberFunction ([[MF_BU:.*]]) {
; CHECK: TypeLeafKind: LF_MFUNCTION (0x1009)
; CHECK: ReturnType: void (0x3)
; CHECK: ClassType: BUnion ({{.*}})
@@ -323,30 +245,26 @@
; CHECK: OneMethod {
; CHECK: TypeLeafKind: LF_ONEMETHOD (0x1511)
; CHECK: AccessSpecifier: Public (0x3)
-; CHECK: Type: void BUnion::() ([[MF5]])
+; CHECK: Type: void BUnion::() ([[MF_BU]])
; CHECK: Name: BUnion
; CHECK: }
; CHECK: }
; CHECK: FuncId ({{.*}}) {
; CHECK: TypeLeafKind: LF_FUNC_ID (0x1601)
; CHECK: ParentScope: 0x0
-; CHECK: FunctionType: BUnion (BUnion&) ([[SP10]])
+; CHECK: FunctionType: BUnion (BUnion&) ([[SP_BU]])
; CHECK: Name: Func_BUnion
; CHECK: }
; CHECK: ]
-
-; ModuleID = 'function-options.cpp'
-source_filename = "function-options.cpp"
-target datalayout = "e-m:w-i64:64-f80:128-n8:16:32:64-S128"
-target triple = "x86_64-pc-windows-msvc19.15.26729"
+; ModuleID = 't.cpp'
+source_filename = "t.cpp"
+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.23.28106"
%class.AClass = type { i8 }
%class.BClass = type { i8 }
-%class.C1Class = type { i8 }
-%class.C2Class = type { i8 }
-%class.DClass = type { i8 }
-%class.FClass = type { i8 }
+%class.CClass = type { i8 }
%struct.AStruct = type { i8 }
%struct.BStruct = type { i8 }
%union.AUnion = type { i8 }
@@ -358,228 +276,192 @@
%retval = alloca %class.AClass, align 1
%arg.addr = alloca %class.AClass*, align 8
store %class.AClass* %arg, %class.AClass** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %class.AClass** %arg.addr, metadata !14, metadata !DIExpression()), !dbg !15
- %0 = load %class.AClass*, %class.AClass** %arg.addr, align 8, !dbg !15
- %coerce.dive = getelementptr inbounds %class.AClass, %class.AClass* %retval, i32 0, i32 0, !dbg !15
- %1 = load i8, i8* %coerce.dive, align 1, !dbg !15
- ret i8 %1, !dbg !15
+ call void @llvm.dbg.declare(metadata %class.AClass** %arg.addr, metadata !13, metadata !DIExpression()), !dbg !14
+ %0 = load %class.AClass*, %class.AClass** %arg.addr, align 8, !dbg !14
+ %coerce.dive = getelementptr inbounds %class.AClass, %class.AClass* %retval, i32 0, i32 0, !dbg !14
+ %1 = load i8, i8* %coerce.dive, align 1, !dbg !14
+ ret i8 %1, !dbg !14
}
-; Function Attrs: nounwind readnone speculatable
+; Function Attrs: nounwind readnone speculatable willreturn
declare void @llvm.dbg.declare(metadata, metadata, metadata) #1
; Function Attrs: noinline nounwind optnone uwtable
-define dso_local void @"?Func_BClass@@YA?AVBClass@@AEAV1@@Z"(%class.BClass* noalias sret %agg.result, %class.BClass* dereferenceable(1) %arg) #0 !dbg !16 {
+define dso_local void @"?Func_BClass@@YA?AVBClass@@AEAV1@@Z"(%class.BClass* noalias sret %agg.result, %class.BClass* dereferenceable(1) %arg) #0 !dbg !15 {
entry:
+ %result.ptr = alloca i8*, align 8
%arg.addr = alloca %class.BClass*, align 8
+ %0 = bitcast %class.BClass* %agg.result to i8*
+ store i8* %0, i8** %result.ptr, align 8
store %class.BClass* %arg, %class.BClass** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %class.BClass** %arg.addr, metadata !26, metadata !DIExpression()), !dbg !27
- %0 = load %class.BClass*, %class.BClass** %arg.addr, align 8, !dbg !27
- ret void, !dbg !27
-}
-
-; Function Attrs: noinline nounwind optnone uwtable
-define dso_local void @"?Func_C1Class@@YA?AVC1Class@@AEAV1@@Z"(%class.C1Class* noalias sret %agg.result, %class.C1Class* dereferenceable(1) %arg) #0 !dbg !28 {
-entry:
- %arg.addr = alloca %class.C1Class*, align 8
- store %class.C1Class* %arg, %class.C1Class** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %class.C1Class** %arg.addr, metadata !38, metadata !DIExpression()), !dbg !39
- %0 = load %class.C1Class*, %class.C1Class** %arg.addr, align 8, !dbg !39
- ret void, !dbg !39
-}
-
-; Function Attrs: noinline nounwind optnone uwtable
-define dso_local void @"?Func_C2Class@@YA?AVC2Class@@AEAV1@@Z"(%class.C2Class* noalias sret %agg.result, %class.C2Class* dereferenceable(1) %arg) #0 !dbg !40 {
-entry:
- %arg.addr = alloca %class.C2Class*, align 8
- store %class.C2Class* %arg, %class.C2Class** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %class.C2Class** %arg.addr, metadata !50, metadata !DIExpression()), !dbg !51
- %0 = load %class.C2Class*, %class.C2Class** %arg.addr, align 8, !dbg !51
- ret void, !dbg !51
+ call void @llvm.dbg.declare(metadata %class.BClass** %arg.addr, metadata !25, metadata !DIExpression()), !dbg !26
+ %1 = load %class.BClass*, %class.BClass** %arg.addr, align 8, !dbg !26
+ ret void, !dbg !26
}
; Function Attrs: noinline nounwind optnone uwtable
-define dso_local void @"?Func_DClass@@YA?AVDClass@@AEAV1@@Z"(%class.DClass* noalias sret %agg.result, %class.DClass* dereferenceable(1) %arg) #0 !dbg !52 {
+define dso_local i8 @"?Func_CClass@@YA?AVCClass@@AEAV1@@Z"(%class.CClass* dereferenceable(1) %arg) #0 !dbg !27 {
entry:
- %arg.addr = alloca %class.DClass*, align 8
- store %class.DClass* %arg, %class.DClass** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %class.DClass** %arg.addr, metadata !59, metadata !DIExpression()), !dbg !60
- %0 = load %class.DClass*, %class.DClass** %arg.addr, align 8, !dbg !60
- ret void, !dbg !60
+ %retval = alloca %class.CClass, align 1
+ %arg.addr = alloca %class.CClass*, align 8
+ store %class.CClass* %arg, %class.CClass** %arg.addr, align 8
+ call void @llvm.dbg.declare(metadata %class.CClass** %arg.addr, metadata !40, metadata !DIExpression()), !dbg !41
+ %0 = load %class.CClass*, %class.CClass** %arg.addr, align 8, !dbg !41
+ %coerce.dive = getelementptr inbounds %class.CClass, %class.CClass* %retval, i32 0, i32 0, !dbg !41
+ %1 = load i8, i8* %coerce.dive, align 1, !dbg !41
+ ret i8 %1, !dbg !41
}
; Function Attrs: noinline nounwind optnone uwtable
-define dso_local i8 @"?Func_FClass@@YA?AVFClass@@AEAV1@@Z"(%class.FClass* dereferenceable(1) %arg) #0 !dbg !61 {
-entry:
- %retval = alloca %class.FClass, align 1
- %arg.addr = alloca %class.FClass*, align 8
- store %class.FClass* %arg, %class.FClass** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %class.FClass** %arg.addr, metadata !69, metadata !DIExpression()), !dbg !70
- %0 = load %class.FClass*, %class.FClass** %arg.addr, align 8, !dbg !70
- %coerce.dive = getelementptr inbounds %class.FClass, %class.FClass* %retval, i32 0, i32 0, !dbg !70
- %1 = load i8, i8* %coerce.dive, align 1, !dbg !70
- ret i8 %1, !dbg !70
-}
-
-; Function Attrs: noinline nounwind optnone uwtable
-define dso_local i8 @"?Func_AStruct@@YA?AUAStruct@@AEAU1@@Z"(%struct.AStruct* dereferenceable(1) %arg) #0 !dbg !71 {
+define dso_local i8 @"?Func_AStruct@@YA?AUAStruct@@AEAU1@@Z"(%struct.AStruct* dereferenceable(1) %arg) #0 !dbg !42 {
entry:
%retval = alloca %struct.AStruct, align 1
%arg.addr = alloca %struct.AStruct*, align 8
store %struct.AStruct* %arg, %struct.AStruct** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %struct.AStruct** %arg.addr, metadata !76, metadata !DIExpression()), !dbg !77
- %0 = load %struct.AStruct*, %struct.AStruct** %arg.addr, align 8, !dbg !77
- %coerce.dive = getelementptr inbounds %struct.AStruct, %struct.AStruct* %retval, i32 0, i32 0, !dbg !77
- %1 = load i8, i8* %coerce.dive, align 1, !dbg !77
- ret i8 %1, !dbg !77
+ call void @llvm.dbg.declare(metadata %struct.AStruct** %arg.addr, metadata !47, metadata !DIExpression()), !dbg !48
+ %0 = load %struct.AStruct*, %struct.AStruct** %arg.addr, align 8, !dbg !48
+ %coerce.dive = getelementptr inbounds %struct.AStruct, %struct.AStruct* %retval, i32 0, i32 0, !dbg !48
+ %1 = load i8, i8* %coerce.dive, align 1, !dbg !48
+ ret i8 %1, !dbg !48
}
; Function Attrs: noinline nounwind optnone uwtable
-define dso_local void @"?Func_BStruct@@YA?AUBStruct@@AEAU1@@Z"(%struct.BStruct* noalias sret %agg.result, %struct.BStruct* dereferenceable(1) %arg) #0 !dbg !78 {
+define dso_local void @"?Func_BStruct@@YA?AUBStruct@@AEAU1@@Z"(%struct.BStruct* noalias sret %agg.result, %struct.BStruct* dereferenceable(1) %arg) #0 !dbg !49 {
entry:
+ %result.ptr = alloca i8*, align 8
%arg.addr = alloca %struct.BStruct*, align 8
+ %0 = bitcast %struct.BStruct* %agg.result to i8*
+ store i8* %0, i8** %result.ptr, align 8
store %struct.BStruct* %arg, %struct.BStruct** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %struct.BStruct** %arg.addr, metadata !88, metadata !DIExpression()), !dbg !89
- %0 = load %struct.BStruct*, %struct.BStruct** %arg.addr, align 8, !dbg !89
- ret void, !dbg !89
+ call void @llvm.dbg.declare(metadata %struct.BStruct** %arg.addr, metadata !59, metadata !DIExpression()), !dbg !60
+ %1 = load %struct.BStruct*, %struct.BStruct** %arg.addr, align 8, !dbg !60
+ ret void, !dbg !60
}
; Function Attrs: noinline nounwind optnone uwtable
-define dso_local i8 @"?Func_AUnion@@YA?ATAUnion@@AEAT1@@Z"(%union.AUnion* dereferenceable(1) %arg) #0 !dbg !90 {
+define dso_local i8 @"?Func_AUnion@@YA?ATAUnion@@AEAT1@@Z"(%union.AUnion* dereferenceable(1) %arg) #0 !dbg !61 {
entry:
%retval = alloca %union.AUnion, align 1
%arg.addr = alloca %union.AUnion*, align 8
store %union.AUnion* %arg, %union.AUnion** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %union.AUnion** %arg.addr, metadata !95, metadata !DIExpression()), !dbg !96
- %0 = load %union.AUnion*, %union.AUnion** %arg.addr, align 8, !dbg !96
- %coerce.dive = getelementptr inbounds %union.AUnion, %union.AUnion* %retval, i32 0, i32 0, !dbg !96
- %1 = load i8, i8* %coerce.dive, align 1, !dbg !96
- ret i8 %1, !dbg !96
+ call void @llvm.dbg.declare(metadata %union.AUnion** %arg.addr, metadata !66, metadata !DIExpression()), !dbg !67
+ %0 = load %union.AUnion*, %union.AUnion** %arg.addr, align 8, !dbg !67
+ %coerce.dive = getelementptr inbounds %union.AUnion, %union.AUnion* %retval, i32 0, i32 0, !dbg !67
+ %1 = load i8, i8* %coerce.dive, align 1, !dbg !67
+ ret i8 %1, !dbg !67
}
; Function Attrs: noinline nounwind optnone uwtable
-define dso_local void @"?Func_BUnion@@YA?ATBUnion@@AEAT1@@Z"(%union.BUnion* noalias sret %agg.result, %union.BUnion* dereferenceable(1) %arg) #0 !dbg !97 {
+define dso_local void @"?Func_BUnion@@YA?ATBUnion@@AEAT1@@Z"(%union.BUnion* noalias sret %agg.result, %union.BUnion* dereferenceable(1) %arg) #0 !dbg !68 {
entry:
+ %result.ptr = alloca i8*, align 8
%arg.addr = alloca %union.BUnion*, align 8
+ %0 = bitcast %union.BUnion* %agg.result to i8*
+ store i8* %0, i8** %result.ptr, align 8
store %union.BUnion* %arg, %union.BUnion** %arg.addr, align 8
- call void @llvm.dbg.declare(metadata %union.BUnion** %arg.addr, metadata !107, metadata !DIExpression()), !dbg !108
- %0 = load %union.BUnion*, %union.BUnion** %arg.addr, align 8, !dbg !108
- ret void, !dbg !108
+ call void @llvm.dbg.declare(metadata %union.BUnion** %arg.addr, metadata !78, metadata !DIExpression()), !dbg !79
+ %1 = load %union.BUnion*, %union.BUnion** %arg.addr, align 8, !dbg !79
+ ret void, !dbg !79
+}
+
+; Function Attrs: noinline norecurse nounwind optnone uwtable
+define dso_local i32 @main() #2 !dbg !80 {
+entry:
+ %retval = alloca i32, align 4
+ store i32 0, i32* %retval, align 4
+ ret i32 0, !dbg !84
}
-attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "frame-pointer"="none" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
-attributes #1 = { nounwind readnone speculatable }
+attributes #0 = { noinline nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="none" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
+attributes #1 = { nounwind readnone speculatable willreturn }
+attributes #2 = { noinline norecurse nounwind optnone uwtable "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "frame-pointer"="none" "less-precise-fpmad"="false" "min-legal-vector-width"="0" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="x86-64" "target-features"="+cx8,+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" }
!llvm.dbg.cu = !{!0}
!llvm.module.flags = !{!3, !4, !5, !6}
!llvm.ident = !{!7}
-!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus, file: !1, producer: "clang version 8.0.0", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
-!1 = !DIFile(filename: "function-options.cpp", directory: "\5Ctest\5CDebugInfo\5CCOFF", checksumkind: CSK_MD5, checksum: "e73e74ea0bd81174051f0a4746343e00")
+!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 11.0.0 (https://github.com/llvm/llvm-project.git 75b555ddcf543fadcf009cb29d37455a4b5d897d)", isOptimized: false, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
+!1 = !DIFile(filename: "t.cpp", directory: "C:\\src\\tests\\duplicate-types\\llvm-test", checksumkind: CSK_MD5, checksum: "cd4c99d9b8e9025eff9ec8bcedfdfb41")
!2 = !{}
!3 = !{i32 2, !"CodeView", i32 1}
!4 = !{i32 2, !"Debug Info Version", i32 3}
!5 = !{i32 1, !"wchar_size", i32 2}
!6 = !{i32 7, !"PIC Level", i32 2}
-!7 = !{!"clang version 8.0.0"}
-!8 = distinct !DISubprogram(name: "Func_AClass", linkageName: "?Func_AClass@@YA?AVAClass@@AEAV1@@Z", scope: !9, file: !9, line: 6, type: !10, isLocal: false, isDefinition: true, scopeLine: 6, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!9 = !DIFile(filename: "function-options.cpp", directory: "D:\5Cupstream\5Cllvm\5Ctest\5CDebugInfo\5CCOFF")
-!10 = !DISubroutineType(types: !11)
-!11 = !{!12, !13}
-!12 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "AClass", file: !9, line: 5, size: 8, flags: DIFlagTypePassByValue, elements: !2, identifier: ".?AVAClass@@")
-!13 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !12, size: 64)
-!14 = !DILocalVariable(name: "arg", arg: 1, scope: !8, file: !9, line: 6, type: !13)
-!15 = !DILocation(line: 6, scope: !8)
-!16 = distinct !DISubprogram(name: "Func_BClass", linkageName: "?Func_BClass@@YA?AVBClass@@AEAV1@@Z", scope: !9, file: !9, line: 12, type: !17, isLocal: false, isDefinition: true, scopeLine: 12, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!17 = !DISubroutineType(types: !18)
-!18 = !{!19, !25}
-!19 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "BClass", file: !9, line: 8, size: 8, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !20, identifier: ".?AVBClass@@")
-!20 = !{!21}
-!21 = !DISubprogram(name: "BClass", scope: !19, file: !9, line: 10, type: !22, isLocal: false, isDefinition: false, scopeLine: 10, flags: DIFlagExplicit | DIFlagPrototyped, isOptimized: false)
-!22 = !DISubroutineType(types: !23)
-!23 = !{null, !24}
-!24 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !19, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
-!25 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !19, size: 64)
-!26 = !DILocalVariable(name: "arg", arg: 1, scope: !16, file: !9, line: 12, type: !25)
-!27 = !DILocation(line: 12, scope: !16)
-!28 = distinct !DISubprogram(name: "Func_C1Class", linkageName: "?Func_C1Class@@YA?AVC1Class@@AEAV1@@Z", scope: !9, file: !9, line: 18, type: !29, isLocal: false, isDefinition: true, scopeLine: 18, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!29 = !DISubroutineType(types: !30)
-!30 = !{!31, !37}
-!31 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "C1Class", file: !9, line: 14, size: 8, flags: DIFlagTypePassByValue, elements: !32, identifier: ".?AVC1Class@@")
-!32 = !{!33}
-!33 = !DISubprogram(name: "C1Class", scope: !31, file: !9, line: 16, type: !34, isLocal: false, isDefinition: false, scopeLine: 16, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false)
-!34 = !DISubroutineType(types: !35)
-!35 = !{null, !36}
-!36 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !31, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
-!37 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !31, size: 64)
-!38 = !DILocalVariable(name: "arg", arg: 1, scope: !28, file: !9, line: 18, type: !37)
-!39 = !DILocation(line: 18, scope: !28)
-!40 = distinct !DISubprogram(name: "Func_C2Class", linkageName: "?Func_C2Class@@YA?AVC2Class@@AEAV1@@Z", scope: !9, file: !9, line: 24, type: !41, isLocal: false, isDefinition: true, scopeLine: 24, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!41 = !DISubroutineType(types: !42)
-!42 = !{!43, !49}
-!43 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "C2Class", file: !9, line: 20, size: 8, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !44, identifier: ".?AVC2Class@@")
-!44 = !{!45}
-!45 = !DISubprogram(name: "~C2Class", scope: !43, file: !9, line: 22, type: !46, isLocal: false, isDefinition: false, scopeLine: 22, flags: DIFlagPublic | DIFlagPrototyped, isOptimized: false)
-!46 = !DISubroutineType(types: !47)
-!47 = !{null, !48}
-!48 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !43, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
-!49 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !43, size: 64)
-!50 = !DILocalVariable(name: "arg", arg: 1, scope: !40, file: !9, line: 24, type: !49)
-!51 = !DILocation(line: 24, scope: !40)
-!52 = distinct !DISubprogram(name: "Func_DClass", linkageName: "?Func_DClass@@YA?AVDClass@@AEAV1@@Z", scope: !9, file: !9, line: 27, type: !53, isLocal: false, isDefinition: true, scopeLine: 27, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!53 = !DISubroutineType(types: !54)
-!54 = !{!55, !58}
-!55 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "DClass", file: !9, line: 26, size: 8, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !56, identifier: ".?AVDClass@@")
-!56 = !{!57}
-!57 = !DIDerivedType(tag: DW_TAG_inheritance, scope: !55, baseType: !19, flags: DIFlagPublic, extraData: i32 0)
-!58 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !55, size: 64)
-!59 = !DILocalVariable(name: "arg", arg: 1, scope: !52, file: !9, line: 27, type: !58)
-!60 = !DILocation(line: 27, scope: !52)
-!61 = distinct !DISubprogram(name: "Func_FClass", linkageName: "?Func_FClass@@YA?AVFClass@@AEAV1@@Z", scope: !9, file: !9, line: 30, type: !62, isLocal: false, isDefinition: true, scopeLine: 30, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
+!7 = !{!"clang version 11.0.0 (https://github.com/llvm/llvm-project.git 75b555ddcf543fadcf009cb29d37455a4b5d897d)"}
+!8 = distinct !DISubprogram(name: "Func_AClass", linkageName: "?Func_AClass@@YA?AVAClass@@AEAV1@@Z", scope: !1, file: !1, line: 5, type: !9, scopeLine: 5, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!9 = !DISubroutineType(types: !10)
+!10 = !{!11, !12}
+!11 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "AClass", file: !1, line: 4, size: 8, flags: DIFlagTypePassByValue, elements: !2, identifier: ".?AVAClass@@")
+!12 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !11, size: 64)
+!13 = !DILocalVariable(name: "arg", arg: 1, scope: !8, file: !1, line: 5, type: !12)
+!14 = !DILocation(line: 5, scope: !8)
+!15 = distinct !DISubprogram(name: "Func_BClass", linkageName: "?Func_BClass@@YA?AVBClass@@AEAV1@@Z", scope: !1, file: !1, line: 11, type: !16, scopeLine: 11, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!16 = !DISubroutineType(flags: DIFlagCxxReturnUdt, types: !17)
+!17 = !{!18, !24}
+!18 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "BClass", file: !1, line: 7, size: 8, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !19, identifier: ".?AVBClass@@")
+!19 = !{!20}
+!20 = !DISubprogram(name: "BClass", scope: !18, file: !1, line: 9, type: !21, scopeLine: 9, flags: DIFlagExplicit | DIFlagPrototyped, spFlags: 0)
+!21 = !DISubroutineType(types: !22)
+!22 = !{null, !23}
+!23 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !18, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!24 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !18, size: 64)
+!25 = !DILocalVariable(name: "arg", arg: 1, scope: !15, file: !1, line: 11, type: !24)
+!26 = !DILocation(line: 11, scope: !15)
+!27 = distinct !DISubprogram(name: "Func_CClass", linkageName: "?Func_CClass@@YA?AVCClass@@AEAV1@@Z", scope: !1, file: !1, line: 17, type: !28, scopeLine: 17, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!28 = !DISubroutineType(types: !29)
+!29 = !{!30, !39}
+!30 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "CClass", file: !1, line: 13, size: 8, flags: DIFlagTypePassByValue, elements: !31, identifier: ".?AVCClass@@")
+!31 = !{!32, !36}
+!32 = !DISubprogram(name: "Member_AClass", linkageName: "?Member_AClass@CClass@@AEAA?AVAClass@@AEAV2@@Z", scope: !30, file: !1, line: 14, type: !33, scopeLine: 14, flags: DIFlagPrototyped, spFlags: 0)
+!33 = !DISubroutineType(flags: DIFlagCxxReturnUdt, types: !34)
+!34 = !{!11, !35, !12}
+!35 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !30, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!36 = !DISubprogram(name: "Member_BClass", linkageName: "?Member_BClass@CClass@@AEAA?AVBClass@@AEAV2@@Z", scope: !30, file: !1, line: 15, type: !37, scopeLine: 15, flags: DIFlagPrototyped, spFlags: 0)
+!37 = !DISubroutineType(flags: DIFlagCxxReturnUdt, types: !38)
+!38 = !{!18, !35, !24}
+!39 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !30, size: 64)
+!40 = !DILocalVariable(name: "arg", arg: 1, scope: !27, file: !1, line: 17, type: !39)
+!41 = !DILocation(line: 17, scope: !27)
+!42 = distinct !DISubprogram(name: "Func_AStruct", linkageName: "?Func_AStruct@@YA?AUAStruct@@AEAU1@@Z", scope: !1, file: !1, line: 20, type: !43, scopeLine: 20, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!43 = !DISubroutineType(types: !44)
+!44 = !{!45, !46}
+!45 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "AStruct", file: !1, line: 19, size: 8, flags: DIFlagTypePassByValue, elements: !2, identifier: ".?AUAStruct@@")
+!46 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !45, size: 64)
+!47 = !DILocalVariable(name: "arg", arg: 1, scope: !42, file: !1, line: 20, type: !46)
+!48 = !DILocation(line: 20, scope: !42)
+!49 = distinct !DISubprogram(name: "Func_BStruct", linkageName: "?Func_BStruct@@YA?AUBStruct@@AEAU1@@Z", scope: !1, file: !1, line: 23, type: !50, scopeLine: 23, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!50 = !DISubroutineType(flags: DIFlagCxxReturnUdt, types: !51)
+!51 = !{!52, !58}
+!52 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "BStruct", file: !1, line: 22, size: 8, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !53, identifier: ".?AUBStruct@@")
+!53 = !{!54}
+!54 = !DISubprogram(name: "BStruct", scope: !52, file: !1, line: 22, type: !55, scopeLine: 22, flags: DIFlagPrototyped, spFlags: 0)
+!55 = !DISubroutineType(types: !56)
+!56 = !{null, !57}
+!57 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !52, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!58 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !52, size: 64)
+!59 = !DILocalVariable(name: "arg", arg: 1, scope: !49, file: !1, line: 23, type: !58)
+!60 = !DILocation(line: 23, scope: !49)
+!61 = distinct !DISubprogram(name: "Func_AUnion", linkageName: "?Func_AUnion@@YA?ATAUnion@@AEAT1@@Z", scope: !1, file: !1, line: 26, type: !62, scopeLine: 26, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
!62 = !DISubroutineType(types: !63)
-!63 = !{!64, !68}
-!64 = distinct !DICompositeType(tag: DW_TAG_class_type, name: "FClass", file: !9, line: 29, size: 8, flags: DIFlagTypePassByValue, elements: !65, identifier: ".?AVFClass@@")
-!65 = !{!66}
-!66 = !DIDerivedType(tag: DW_TAG_member, name: "x", scope: !64, file: !9, line: 29, baseType: !67, flags: DIFlagStaticMember)
-!67 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
-!68 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !64, size: 64)
-!69 = !DILocalVariable(name: "arg", arg: 1, scope: !61, file: !9, line: 30, type: !68)
-!70 = !DILocation(line: 30, scope: !61)
-!71 = distinct !DISubprogram(name: "Func_AStruct", linkageName: "?Func_AStruct@@YA?AUAStruct@@AEAU1@@Z", scope: !9, file: !9, line: 33, type: !72, isLocal: false, isDefinition: true, scopeLine: 33, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!72 = !DISubroutineType(types: !73)
-!73 = !{!74, !75}
-!74 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "AStruct", file: !9, line: 32, size: 8, flags: DIFlagTypePassByValue, elements: !2, identifier: ".?AUAStruct@@")
-!75 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !74, size: 64)
-!76 = !DILocalVariable(name: "arg", arg: 1, scope: !71, file: !9, line: 33, type: !75)
-!77 = !DILocation(line: 33, scope: !71)
-!78 = distinct !DISubprogram(name: "Func_BStruct", linkageName: "?Func_BStruct@@YA?AUBStruct@@AEAU1@@Z", scope: !9, file: !9, line: 36, type: !79, isLocal: false, isDefinition: true, scopeLine: 36, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!79 = !DISubroutineType(types: !80)
-!80 = !{!81, !87}
-!81 = distinct !DICompositeType(tag: DW_TAG_structure_type, name: "BStruct", file: !9, line: 35, size: 8, flags: DIFlagTypePassByValue | DIFlagNonTrivial, elements: !82, identifier: ".?AUBStruct@@")
+!63 = !{!64, !65}
+!64 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "AUnion", file: !1, line: 25, size: 8, flags: DIFlagTypePassByValue, elements: !2, identifier: ".?ATAUnion@@")
+!65 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !64, size: 64)
+!66 = !DILocalVariable(name: "arg", arg: 1, scope: !61, file: !1, line: 26, type: !65)
+!67 = !DILocation(line: 26, scope: !61)
+!68 = distinct !DISubprogram(name: "Func_BUnion", linkageName: "?Func_BUnion@@YA?ATBUnion@@AEAT1@@Z", scope: !1, file: !1, line: 29, type: !69, scopeLine: 29, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!69 = !DISubroutineType(types: !70)
+!70 = !{!71, !77}
+!71 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "BUnion", file: !1, line: 28, size: 8, flags: DIFlagTypePassByValue, elements: !72, identifier: ".?ATBUnion@@")
+!72 = !{!73}
+!73 = !DISubprogram(name: "BUnion", scope: !71, file: !1, line: 28, type: !74, scopeLine: 28, flags: DIFlagPrototyped, spFlags: 0)
+!74 = !DISubroutineType(types: !75)
+!75 = !{null, !76}
+!76 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !71, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
+!77 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !71, size: 64)
+!78 = !DILocalVariable(name: "arg", arg: 1, scope: !68, file: !1, line: 29, type: !77)
+!79 = !DILocation(line: 29, scope: !68)
+!80 = distinct !DISubprogram(name: "main", scope: !1, file: !1, line: 31, type: !81, scopeLine: 31, flags: DIFlagPrototyped, spFlags: DISPFlagDefinition, unit: !0, retainedNodes: !2)
+!81 = !DISubroutineType(types: !82)
!82 = !{!83}
-!83 = !DISubprogram(name: "BStruct", scope: !81, file: !9, line: 35, type: !84, isLocal: false, isDefinition: false, scopeLine: 35, flags: DIFlagPrototyped, isOptimized: false)
-!84 = !DISubroutineType(types: !85)
-!85 = !{null, !86}
-!86 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !81, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
-!87 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !81, size: 64)
-!88 = !DILocalVariable(name: "arg", arg: 1, scope: !78, file: !9, line: 36, type: !87)
-!89 = !DILocation(line: 36, scope: !78)
-!90 = distinct !DISubprogram(name: "Func_AUnion", linkageName: "?Func_AUnion@@YA?ATAUnion@@AEAT1@@Z", scope: !9, file: !9, line: 39, type: !91, isLocal: false, isDefinition: true, scopeLine: 39, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!91 = !DISubroutineType(types: !92)
-!92 = !{!93, !94}
-!93 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "AUnion", file: !9, line: 38, size: 8, flags: DIFlagTypePassByValue, elements: !2, identifier: ".?ATAUnion@@")
-!94 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !93, size: 64)
-!95 = !DILocalVariable(name: "arg", arg: 1, scope: !90, file: !9, line: 39, type: !94)
-!96 = !DILocation(line: 39, scope: !90)
-!97 = distinct !DISubprogram(name: "Func_BUnion", linkageName: "?Func_BUnion@@YA?ATBUnion@@AEAT1@@Z", scope: !9, file: !9, line: 42, type: !98, isLocal: false, isDefinition: true, scopeLine: 42, flags: DIFlagPrototyped, isOptimized: false, unit: !0, retainedNodes: !2)
-!98 = !DISubroutineType(types: !99)
-!99 = !{!100, !106}
-!100 = distinct !DICompositeType(tag: DW_TAG_union_type, name: "BUnion", file: !9, line: 41, size: 8, flags: DIFlagTypePassByValue, elements: !101, identifier: ".?ATBUnion@@")
-!101 = !{!102}
-!102 = !DISubprogram(name: "BUnion", scope: !100, file: !9, line: 41, type: !103, isLocal: false, isDefinition: false, scopeLine: 41, flags: DIFlagPrototyped, isOptimized: false)
-!103 = !DISubroutineType(types: !104)
-!104 = !{null, !105}
-!105 = !DIDerivedType(tag: DW_TAG_pointer_type, baseType: !100, size: 64, flags: DIFlagArtificial | DIFlagObjectPointer)
-!106 = !DIDerivedType(tag: DW_TAG_reference_type, baseType: !100, size: 64)
-!107 = !DILocalVariable(name: "arg", arg: 1, scope: !97, file: !9, line: 42, type: !106)
-!108 = !DILocation(line: 42, scope: !97)
+!83 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed)
+!84 = !DILocation(line: 32, scope: !80)
Index: llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
===================================================================
--- llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
+++ llvm/lib/CodeGen/AsmPrinter/CodeViewDebug.cpp
@@ -412,16 +412,9 @@
const DICompositeType *ClassTy = nullptr,
StringRef SPName = StringRef("")) {
FunctionOptions FO = FunctionOptions::None;
- const DIType *ReturnTy = nullptr;
- if (auto TypeArray = Ty->getTypeArray()) {
- if (TypeArray.size())
- ReturnTy = TypeArray[0];
- }
- if (auto *ReturnDCTy = dyn_cast_or_null<DICompositeType>(ReturnTy)) {
- if (isNonTrivial(ReturnDCTy))
- FO |= FunctionOptions::CxxReturnUdt;
- }
+ if ((Ty->getFlags() & DINode::FlagCxxReturnUdt) == DINode::FlagCxxReturnUdt)
+ FO |= FunctionOptions::CxxReturnUdt;
// DISubroutineType is unnamed. Use DISubprogram's i.e. SPName in comparison.
if (ClassTy && isNonTrivial(ClassTy) && SPName == ClassTy->getName()) {
Index: llvm/include/llvm/IR/DebugInfoFlags.def
===================================================================
--- llvm/include/llvm/IR/DebugInfoFlags.def
+++ llvm/include/llvm/IR/DebugInfoFlags.def
@@ -58,6 +58,7 @@
HANDLE_DI_FLAG((1 << 27), BigEndian)
HANDLE_DI_FLAG((1 << 28), LittleEndian)
HANDLE_DI_FLAG((1 << 29), AllCallsDescribed)
+HANDLE_DI_FLAG((1 << 30), CxxReturnUdt)
// To avoid needing a dedicated value for IndirectVirtualBase, we use
// the bitwise or of Virtual and FwdDecl, which does not otherwise
@@ -67,7 +68,7 @@
#ifdef DI_FLAG_LARGEST_NEEDED
// intended to be used with ADT/BitmaskEnum.h
// NOTE: always must be equal to largest flag, check this when adding new flag
-HANDLE_DI_FLAG((1 << 29), Largest)
+HANDLE_DI_FLAG((1 << 30), Largest)
#undef DI_FLAG_LARGEST_NEEDED
#endif
Index: clang/test/CodeGenCXX/debug-info-return-udt.cpp
===================================================================
--- /dev/null
+++ clang/test/CodeGenCXX/debug-info-return-udt.cpp
@@ -0,0 +1,109 @@
+// RUN: %clang_cc1 -emit-llvm -gcodeview -debug-info-kind=limited %s -o - | FileCheck %s
+// Test for CxxReturnUdt flags in debug info.
+
+#define DEFINE_FUNCTION(T) \
+ T Func_##T(T &arg) { return arg; }
+
+class AClass {};
+DEFINE_FUNCTION(AClass);
+// CHECK: !DISubprogram(name: "Func_AClass"
+// CHECK-SAME: type: ![[TYPE_A:[0-9]+]]
+// CHECK: ![[TYPE_A]] = !DISubroutineType
+// CHECK-NOT: DIFlagCxxReturnUdt
+
+class BClass {
+private:
+ explicit BClass();
+};
+DEFINE_FUNCTION(BClass);
+// CHECK: !DISubprogram(name: "Func_BClass"
+// CHECK-SAME: type: ![[TYPE_B:[0-9]+]]
+// CHECK: ![[TYPE_B]] = !DISubroutineType
+// CHECK-SAME: DIFlagCxxReturnUdt
+
+class C1Class {
+public:
+ C1Class() = default; // Note: Clang generates one defautled ctor (FO = None)
+ // while MSVC doesn't.
+};
+DEFINE_FUNCTION(C1Class);
+// CHECK: !DISubprogram(name: "Func_C1Class"
+// CHECK-SAME: type: ![[TYPE_C1:[0-9]+]]
+// CHECK: ![[TYPE_C1]] = !DISubroutineType
+// CHECK-NOT: DIFlagCxxReturnUdt
+
+class C2Class { // Note: MSVC-specific dtor, i.e. __vecDelDtor won't be
+ // verified in this case.
+public:
+ ~C2Class() {}
+};
+DEFINE_FUNCTION(C2Class);
+// CHECK: !DISubprogram(name: "Func_C2Class"
+// CHECK-SAME: type: ![[TYPE_C2:[0-9]+]]
+// CHECK: ![[TYPE_C2]] = !DISubroutineType
+// CHECK-SAME: DIFlagCxxReturnUdt
+
+class DClass : public BClass {}; // Note: MSVC yields one compiler-generated
+ // ctor for DClass while clang doesn't.
+DEFINE_FUNCTION(DClass);
+// CHECK: !DISubprogram(name: "Func_DClass"
+// CHECK-SAME: type: ![[TYPE_D:[0-9]+]]
+// CHECK: ![[TYPE_D]] = !DISubroutineType
+// CHECK-SAME: DIFlagCxxReturnUdt
+
+class FClass {
+ static int x;
+
+ // Check that member functions also have the flag.
+ AClass Member_AClass(AClass &);
+
+ BClass Member_BClass(BClass &);
+};
+DEFINE_FUNCTION(FClass);
+// CHECK: !DISubprogram(name: "Func_FClass"
+// CHECK-SAME: type: ![[TYPE_F:[0-9]+]]
+// CHECK: ![[TYPE_F]] = !DISubroutineType
+// CHECK-NOT: DIFlagCxxReturnUdt
+
+// CHECK: !DISubprogram(name: "Member_AClass"
+// CHECK-SAME: type: ![[MEMBER_A:[0-9]+]]
+// CHECK: ![[MEMBER_A]] = !DISubroutineType
+// CHECK-SAME: DIFlagCxxReturnUdt
+
+// CHECK: !DISubprogram(name: "Member_BClass"
+// CHECK-SAME: type: ![[MEMBER_B:[0-9]+]]
+// CHECK: ![[MEMBER_B]] = !DISubroutineType
+// CHECK-SAME: DIFlagCxxReturnUdt
+
+struct AStruct {}; // Note: Clang generates one defaulted ctor (FO = None)
+ // while MSVC does not.
+DEFINE_FUNCTION(AStruct);
+// CHECK: !DISubprogram(name: "Func_AStruct"
+// CHECK-SAME: type: ![[TYPE_AS:[0-9]+]]
+// CHECK: ![[TYPE_AS]] = !DISubroutineType
+// CHECK-NOT: DIFlagCxxReturnUdt
+
+struct BStruct {
+ BStruct();
+};
+DEFINE_FUNCTION(BStruct);
+// CHECK: !DISubprogram(name: "Func_BStruct"
+// CHECK-SAME: type: ![[TYPE_BS:[0-9]+]]
+// CHECK: ![[TYPE_BS]] = !DISubroutineType
+// CHECK-SAME: DIFlagCxxReturnUdt
+
+union AUnion {};
+DEFINE_FUNCTION(AUnion);
+// CHECK: !DISubprogram(name: "Func_AUnion"
+// CHECK-SAME: type: ![[TYPE_AU:[0-9]+]]
+// CHECK: ![[TYPE_AU]] = !DISubroutineType
+// CHECK-NOT: DIFlagCxxReturnUdt
+
+union BUnion {
+ BUnion() = default;
+};
+DEFINE_FUNCTION(BUnion);
+// CHECK: !DISubprogram(name: "Func_BUnion"
+// CHECK-SAME: type: ![[TYPE_BU:[0-9]+]]
+// CHECK: ![[TYPE_BU]] = !DISubroutineType
+// CHECK-NOT: DIFlagCxxReturnUdt
Index: clang/lib/CodeGen/CGDebugInfo.cpp
===================================================================
--- clang/lib/CodeGen/CGDebugInfo.cpp
+++ clang/lib/CodeGen/CGDebugInfo.cpp
@@ -1199,6 +1199,13 @@
llvm::DIFile *Unit) {
SmallVector<llvm::Metadata *, 16> EltTys;
+ llvm::DINode::DIFlags Flags = llvm::DINode::FlagZero;
+
+ // Check if function has a nontrivial CXXRecordDecl return type.
+ if (CXXRecordDecl *CXXRD = Ty->getReturnType()->getAsCXXRecordDecl())
+ if (CXXRD->hasDefinition() && !CXXRD->isTrivial())
+ Flags |= llvm::DINode::FlagCxxReturnUdt;
+
// Add the result type at least.
EltTys.push_back(getOrCreateType(Ty->getReturnType(), Unit));
@@ -1214,7 +1221,7 @@
}
llvm::DITypeRefArray EltTypeArray = DBuilder.getOrCreateTypeArray(EltTys);
- return DBuilder.createSubroutineType(EltTypeArray, llvm::DINode::FlagZero,
+ return DBuilder.createSubroutineType(EltTypeArray, Flags,
getDwarfCC(Ty->getCallConv()));
}
@@ -1530,6 +1537,11 @@
if (Func->getExtProtoInfo().RefQualifier == RQ_RValue)
Flags |= llvm::DINode::FlagRValueReference;
+ // Check if method has a CXXRecordDecl return type. Don't check if it is
+ // trivial because it might not be defined.
+ if (CXXRecordDecl *CXXRD = Func->getReturnType()->getAsCXXRecordDecl())
+ Flags |= llvm::DINode::FlagCxxReturnUdt;
+
return DBuilder.createSubroutineType(EltTypeArray, Flags,
getDwarfCC(Func->getCallConv()));
}
@@ -3566,6 +3578,13 @@
const auto *FTy = FnType->getAs<FunctionType>();
CallingConv CC = FTy ? FTy->getCallConv() : CallingConv::CC_C;
+ llvm::DINode::DIFlags Flags = llvm::DINode::FlagZero;
+
+ // Check if function has a nontrivial CXXRecordDecl return type.
+ if (CXXRecordDecl *CXXRD = FTy->getReturnType()->getAsCXXRecordDecl())
+ if (CXXRD->hasDefinition() && !CXXRD->isTrivial())
+ Flags |= llvm::DINode::FlagCxxReturnUdt;
+
if (const auto *OMethod = dyn_cast<ObjCMethodDecl>(D)) {
// Add "self" and "_cmd"
SmallVector<llvm::Metadata *, 16> Elts;
@@ -3615,8 +3634,7 @@
EltTys.push_back(getOrCreateType(ParamType, F));
EltTys.push_back(DBuilder.createUnspecifiedParameter());
llvm::DITypeRefArray EltTypeArray = DBuilder.getOrCreateTypeArray(EltTys);
- return DBuilder.createSubroutineType(EltTypeArray, llvm::DINode::FlagZero,
- getDwarfCC(CC));
+ return DBuilder.createSubroutineType(EltTypeArray, Flags, getDwarfCC(CC));
}
return cast<llvm::DISubroutineType>(getOrCreateType(FnType, F));
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
