diff options
Diffstat (limited to 'llvm/test/DebugInfo')
24 files changed, 141 insertions, 137 deletions
diff --git a/llvm/test/DebugInfo/COFF/asm.ll b/llvm/test/DebugInfo/COFF/asm.ll index 3d245e9d396..a55eec2782a 100644 --- a/llvm/test/DebugInfo/COFF/asm.ll +++ b/llvm/test/DebugInfo/COFF/asm.ll @@ -35,7 +35,7 @@ ; OBJ32: CodeViewDebugInfo [ ; OBJ32: Subsection [ ; OBJ32-NEXT: SubSectionType: Symbols (0xF1) -; OBJ32: ProcStart { +; OBJ32: {{.*}}Proc{{.*}}Sym { ; OBJ32: CodeSize: 0x6 ; OBJ32: DisplayName: f ; OBJ32: LinkageName: _f @@ -94,13 +94,13 @@ ; OBJ64: ] ; OBJ64: Subsection [ ; OBJ64-NEXT: SubSectionType: Symbols (0xF1) -; OBJ64: ProcStart { +; OBJ64: {{.*}}Proc{{.*}}Sym { ; OBJ64: CodeSize: 0xE ; OBJ64: DisplayName: f ; OBJ64: LinkageName: f ; OBJ64: } ; OBJ64-NEXT: ProcEnd { -; OBJ64-NEXT: } +; OBJ64: } ; OBJ64-NEXT: ] ; OBJ64: FunctionLineTable [ ; OBJ64-NEXT: Name: f diff --git a/llvm/test/DebugInfo/COFF/cpp-mangling.ll b/llvm/test/DebugInfo/COFF/cpp-mangling.ll index 8d1a136ec5f..6f8b5a21ffb 100644 --- a/llvm/test/DebugInfo/COFF/cpp-mangling.ll +++ b/llvm/test/DebugInfo/COFF/cpp-mangling.ll @@ -12,12 +12,12 @@ ; fn_tmpl<int, foo::bar>(); ; } -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: FunctionType: bar ({{.*}}) ; CHECK: DisplayName: foo::bar{{$}} ; CHECK-NEXT: LinkageName: ?bar@foo@@YAHH@Z -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: FunctionType: fn_tmpl ({{.*}}) ; CHECK: DisplayName: foo::fn_tmpl<int,&foo::bar> ; CHECK-NEXT: LinkageName: ??$fn_tmpl@H$1?bar@foo@@YAHH@Z@foo@@YAXXZ diff --git a/llvm/test/DebugInfo/COFF/fp-stack.ll b/llvm/test/DebugInfo/COFF/fp-stack.ll index 4a30a49a376..8061e2ee23d 100644 --- a/llvm/test/DebugInfo/COFF/fp-stack.ll +++ b/llvm/test/DebugInfo/COFF/fp-stack.ll @@ -11,7 +11,7 @@ entry: } ; ASM: .cv_def_range Lfunc_begin0 Lfunc_end0, "A\021\200\000\000\000" -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 128 ; OBJ: MayHaveNoName: 0 ; OBJ: LocalVariableAddrRange { diff --git a/llvm/test/DebugInfo/COFF/globals.ll b/llvm/test/DebugInfo/COFF/globals.ll index 0d1b9413e3d..f5d6906e181 100644 --- a/llvm/test/DebugInfo/COFF/globals.ll +++ b/llvm/test/DebugInfo/COFF/globals.ll @@ -81,13 +81,13 @@ ; OBJ: DisplayName: first ; OBJ: LinkageName: ?first@@3HA ; OBJ: } -; OBJ: ThreadLocalDataSym { +; OBJ: GlobalTLS { ; OBJ: DataOffset: ?middle@@3PEBHEB+0x0 ; OBJ: Type: const int* (0x1001) ; OBJ: DisplayName: middle ; OBJ: LinkageName: ?middle@@3PEBHEB ; OBJ: } -; OBJ: DataSym { +; OBJ: GlobalData { ; OBJ: Kind: S_GDATA32 (0x110D) ; OBJ: DataOffset: ?last@@3HA+0x0 ; OBJ: Type: int (0x74) @@ -101,7 +101,7 @@ ; OBJ: Magic: 0x4 ; OBJ: Subsection [ ; OBJ: SubSectionType: Symbols (0xF1) -; OBJ: DataSym { +; OBJ: GlobalData { ; OBJ: DataOffset: ?comdat@?$A@X@@2HB+0x0 ; OBJ: Type: const int (0x1000) ; OBJ: DisplayName: comdat diff --git a/llvm/test/DebugInfo/COFF/inlining-files.ll b/llvm/test/DebugInfo/COFF/inlining-files.ll index a6f5d281eb0..e3e616b618d 100644 --- a/llvm/test/DebugInfo/COFF/inlining-files.ll +++ b/llvm/test/DebugInfo/COFF/inlining-files.ll @@ -18,10 +18,10 @@ ; OBJ: Subsection [ ; OBJ: SubSectionType: Symbols (0xF1) -; OBJ: ProcStart { +; OBJ: {{.*}}Proc{{.*}}Sym { ; OBJ: DisplayName: f ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: PtrParent: 0x0 ; OBJ: PtrEnd: 0x0 ; OBJ: Inlinee: file_change (0x1002) diff --git a/llvm/test/DebugInfo/COFF/inlining-header.ll b/llvm/test/DebugInfo/COFF/inlining-header.ll index 0981825e0d3..7e19f14716f 100644 --- a/llvm/test/DebugInfo/COFF/inlining-header.ll +++ b/llvm/test/DebugInfo/COFF/inlining-header.ll @@ -63,7 +63,7 @@ ; OBJ: Subsection [ ; OBJ: SubSectionType: Symbols (0xF1) -; OBJ: ProcStart { +; OBJ: {{.*}}Proc{{.*}}Sym { ; OBJ: Kind: S_GPROC32_ID (0x1147) ; OBJ: FunctionType: main (0x1005) ; OBJ: CodeOffset: _main+0x0 @@ -74,8 +74,8 @@ ; OBJ: LinkageName: _main ; OBJ: } -; Previously, g's InlineSite referenced t.h, which was wasteful. -; OBJ: InlineSite { +; Previously, g's InlineSiteSym referenced t.h, which was wasteful. +; OBJ: InlineSiteSym { ; OBJ: Inlinee: g (0x1002) ; OBJ: BinaryAnnotations [ ; OBJ-NEXT: ChangeCodeOffsetAndLineOffset: {CodeOffset: 0x6, LineOffset: 1} @@ -85,7 +85,7 @@ ; OBJ-NEXT: ] ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: Inlinee: f (0x1003) ; OBJ: BinaryAnnotations [ ; OBJ-NEXT: ChangeCodeOffsetAndLineOffset: {CodeOffset: 0xD, LineOffset: 1} diff --git a/llvm/test/DebugInfo/COFF/inlining-levels.ll b/llvm/test/DebugInfo/COFF/inlining-levels.ll index 0c5c73c8fdb..7f93dbb850a 100644 --- a/llvm/test/DebugInfo/COFF/inlining-levels.ll +++ b/llvm/test/DebugInfo/COFF/inlining-levels.ll @@ -18,14 +18,14 @@ ; OBJ: Subsection [ ; OBJ: SubSectionType: Symbols (0xF1) -; OBJ: ProcStart { -; OBJ: InlineSite { +; OBJ: {{.*}}Proc{{.*}}Sym { +; OBJ: InlineSiteSym { ; OBJ: Inlinee: h (0x1002) ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: Inlinee: g (0x1003) ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: Inlinee: f (0x1004) ; OBJ: } ; OBJ: InlineSiteEnd { diff --git a/llvm/test/DebugInfo/COFF/inlining-same-name.ll b/llvm/test/DebugInfo/COFF/inlining-same-name.ll index 4a9c9924135..3700b7060a7 100644 --- a/llvm/test/DebugInfo/COFF/inlining-same-name.ll +++ b/llvm/test/DebugInfo/COFF/inlining-same-name.ll @@ -14,15 +14,15 @@ ; CHECK: CodeViewDebugInfo [ ; CHECK: Section: .debug$S ; CHECK: Subsection [ -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: DisplayName: main ; CHECK: } -; CHECK: InlineSite { +; CHECK: InlineSiteSym { ; CHECK: Inlinee: same_name (0x1002) ; CHECK: } ; CHECK: InlineSiteEnd { ; CHECK: } -; CHECK: InlineSite { +; CHECK: InlineSiteSym { ; CHECK: Inlinee: same_name (0x1002) ; CHECK: } ; CHECK: InlineSiteEnd { diff --git a/llvm/test/DebugInfo/COFF/inlining.ll b/llvm/test/DebugInfo/COFF/inlining.ll index 76b8f8c88ee..ddfd5e056a1 100644 --- a/llvm/test/DebugInfo/COFF/inlining.ll +++ b/llvm/test/DebugInfo/COFF/inlining.ll @@ -166,7 +166,7 @@ ; OBJ: ] ; OBJ: Subsection [ ; OBJ: SubSectionType: Symbols (0xF1) -; OBJ: ProcStart { +; OBJ: {{.*}}Proc{{.*}}Sym { ; OBJ: PtrParent: 0x0 ; OBJ: PtrEnd: 0x0 ; OBJ: PtrNext: 0x0 @@ -181,7 +181,7 @@ ; OBJ: DisplayName: baz ; OBJ: LinkageName: ?baz@@YAXXZ ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: PtrParent: 0x0 ; OBJ: PtrEnd: 0x0 ; OBJ: Inlinee: bar (0x1002) @@ -193,7 +193,7 @@ ; OBJ-NEXT: ChangeCodeLength: 0x7 ; OBJ: ] ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: PtrParent: 0x0 ; OBJ: PtrEnd: 0x0 ; OBJ: Inlinee: foo (0x1003) diff --git a/llvm/test/DebugInfo/COFF/int8-char-type.ll b/llvm/test/DebugInfo/COFF/int8-char-type.ll index 82972a45281..2e4395b4a59 100644 --- a/llvm/test/DebugInfo/COFF/int8-char-type.ll +++ b/llvm/test/DebugInfo/COFF/int8-char-type.ll @@ -5,7 +5,7 @@ ; DW_ATE_[un]signed encoding for all integer types if they don't have distinct ; integer types for characters types. This was PR30552. -; CHECK-LABEL: DataSym { +; CHECK-LABEL: GlobalData { ; CHECK-NEXT: Kind: S_GDATA32 (0x110D) ; CHECK-NEXT: DataOffset: ; CHECK-NEXT: Type: signed char (0x10) @@ -13,7 +13,7 @@ ; CHECK-NEXT: LinkageName: x ; CHECK-NEXT: } -; CHECK-LABEL: DataSym { +; CHECK-LABEL: GlobalData { ; CHECK-NEXT: Kind: S_GDATA32 (0x110D) ; CHECK-NEXT: DataOffset: ; CHECK-NEXT: Type: unsigned char (0x20) diff --git a/llvm/test/DebugInfo/COFF/local-constant.ll b/llvm/test/DebugInfo/COFF/local-constant.ll index bf8ba8446a6..c99dd32e22e 100644 --- a/llvm/test/DebugInfo/COFF/local-constant.ll +++ b/llvm/test/DebugInfo/COFF/local-constant.ll @@ -11,10 +11,11 @@ ; FIXME: Find a way to describe variables optimized to constants. -; OBJ: ProcStart { +; OBJ: {{.*}}Proc{{.*}}Sym { ; OBJ: DisplayName: constant_var ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { +; OBJ-NEXT: Kind: ; OBJ-NEXT: Type: int (0x74) ; OBJ-NEXT: Flags [ (0x100) ; OBJ-NEXT: IsOptimizedOut (0x100) diff --git a/llvm/test/DebugInfo/COFF/local-variable-gap.ll b/llvm/test/DebugInfo/COFF/local-variable-gap.ll index a2d05eaa03e..ab38bbd8c13 100644 --- a/llvm/test/DebugInfo/COFF/local-variable-gap.ll +++ b/llvm/test/DebugInfo/COFF/local-variable-gap.ll @@ -66,12 +66,13 @@ ; ASM: .short 2 # Record length ; ASM: .short 4431 # Record kind: S_PROC_ID_END -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: VarName: p ; OBJ: } -; OBJ-NOT: Local { -; OBJ: DefRangeRegister { +; OBJ-NOT: LocalSym { +; OBJ: DefRangeRegisterSym { +; OBJ-NEXT: Kind: ; OBJ-NEXT: Register: 23 ; OBJ-NEXT: MayHaveNoName: 0 ; OBJ-NEXT: LocalVariableAddrRange { diff --git a/llvm/test/DebugInfo/COFF/local-variables.ll b/llvm/test/DebugInfo/COFF/local-variables.ll index 249b6e1103d..f7087f76f4c 100644 --- a/llvm/test/DebugInfo/COFF/local-variables.ll +++ b/llvm/test/DebugInfo/COFF/local-variables.ll @@ -99,18 +99,18 @@ ; OBJ: Subsection [ ; OBJ: SubSectionType: Symbols (0xF1) -; OBJ: ProcStart { +; OBJ: {{.*}}Proc{{.*}}Sym { ; OBJ: DisplayName: f ; OBJ: LinkageName: f ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x1) ; OBJ: IsParameter (0x1) ; OBJ: ] ; OBJ: VarName: param ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 @@ -121,13 +121,13 @@ ; OBJ: Range: 0x4F ; OBJ: } ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: a ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 @@ -138,13 +138,13 @@ ; OBJ: Range: 0x21 ; OBJ: } ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: b ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 @@ -155,7 +155,7 @@ ; OBJ: Range: 0x1F ; OBJ: } ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: PtrParent: 0x0 ; OBJ: PtrEnd: 0x0 ; OBJ: Inlinee: will_be_inlined (0x1002) @@ -166,13 +166,13 @@ ; OBJ: ChangeCodeLength: 0xC ; OBJ: ] ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: v ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 @@ -185,7 +185,7 @@ ; OBJ: } ; OBJ: InlineSiteEnd { ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: PtrParent: 0x0 ; OBJ: PtrEnd: 0x0 ; OBJ: Inlinee: will_be_inlined (0x1002) @@ -196,13 +196,13 @@ ; OBJ: ChangeCodeLength: 0xA ; OBJ: ] ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: v ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: No ; OBJ: OffsetInParent: 0 diff --git a/llvm/test/DebugInfo/COFF/long-name.ll b/llvm/test/DebugInfo/COFF/long-name.ll index 998d77f7ca0..65bd4c16f75 100644 --- a/llvm/test/DebugInfo/COFF/long-name.ll +++ b/llvm/test/DebugInfo/COFF/long-name.ll @@ -1,6 +1,6 @@ ; RUN: llc < %s -filetype=obj | llvm-readobj -codeview | FileCheck %s -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: Kind: S_GPROC32_ID (0x1147) ; CHECK: FunctionType: {{A+}} (0x1002) ; CHECK: CodeOffset: f+0x0 diff --git a/llvm/test/DebugInfo/COFF/multifile.ll b/llvm/test/DebugInfo/COFF/multifile.ll index 5e53fa57acc..8af99a6063e 100644 --- a/llvm/test/DebugInfo/COFF/multifile.ll +++ b/llvm/test/DebugInfo/COFF/multifile.ll @@ -43,13 +43,13 @@ ; OBJ32: ] ; OBJ32: Subsection [ ; OBJ32-NEXT: SubSectionType: Symbols (0xF1) -; OBJ32: ProcStart { +; OBJ32: {{.*}}Proc{{.*}}Sym { ; OBJ32: CodeSize: 0x10 ; OBJ32: DisplayName: f ; OBJ32: LinkageName: _f ; OBJ32: } ; OBJ32-NEXT: ProcEnd { -; OBJ32-NEXT: } +; OBJ32: } ; OBJ32-NEXT: ] ; OBJ32: FunctionLineTable [ ; OBJ32-NEXT: Name: _f @@ -115,13 +115,13 @@ ; OBJ64: ] ; OBJ64: Subsection [ ; OBJ64-NEXT: SubSectionType: Symbols (0xF1) -; OBJ64: ProcStart { +; OBJ64: {{.*}}Proc{{.*}}Sym { ; OBJ64: CodeSize: 0x18 ; OBJ64: DisplayName: f ; OBJ64: LinkageName: f ; OBJ64: } ; OBJ64-NEXT: ProcEnd { -; OBJ64-NEXT: } +; OBJ64: } ; OBJ64-NEXT: ] ; OBJ64: FunctionLineTable [ ; OBJ64-NEXT: Name: f diff --git a/llvm/test/DebugInfo/COFF/multifunction.ll b/llvm/test/DebugInfo/COFF/multifunction.ll index a6290e8f021..87db2a20eaa 100644 --- a/llvm/test/DebugInfo/COFF/multifunction.ll +++ b/llvm/test/DebugInfo/COFF/multifunction.ll @@ -145,7 +145,7 @@ ; OBJ32: ] ; OBJ32: Subsection [ ; OBJ32-NEXT: SubSectionType: Symbols (0xF1) -; OBJ32: ProcStart { +; OBJ32: {{.*}}Proc{{.*}}Sym { ; OBJ32: Kind: S_LPROC32_ID (0x1146) ; OBJ32: CodeSize: 0x6 ; OBJ32: DisplayName: x @@ -159,7 +159,7 @@ ; OBJ32: ] ; OBJ32: Subsection [ ; OBJ32-NEXT: SubSectionType: Symbols (0xF1) -; OBJ32: ProcStart { +; OBJ32: {{.*}}Proc{{.*}}Sym { ; OBJ32: Kind: S_GPROC32_ID (0x1147) ; OBJ32: CodeSize: 0x6 ; OBJ32: DisplayName: y @@ -173,7 +173,7 @@ ; OBJ32: ] ; OBJ32: Subsection [ ; OBJ32-NEXT: SubSectionType: Symbols (0xF1) -; OBJ32: ProcStart { +; OBJ32: {{.*}}Proc{{.*}}Sym { ; OBJ32: Kind: S_GPROC32_ID (0x1147) ; OBJ32: CodeSize: 0x10 ; OBJ32: DisplayName: f @@ -419,7 +419,7 @@ ; OBJ64-NEXT: ] ; OBJ64: Subsection [ ; OBJ64-NEXT: SubSectionType: Symbols (0xF1) -; OBJ64: ProcStart { +; OBJ64: {{.*}}Proc{{.*}}Sym { ; OBJ64: Kind: S_LPROC32_ID (0x1146) ; OBJ64: CodeSize: 0xE ; OBJ64: DisplayName: x @@ -433,7 +433,7 @@ ; OBJ64: ] ; OBJ64: Subsection [ ; OBJ64-NEXT: SubSectionType: Symbols (0xF1) -; OBJ64: ProcStart { +; OBJ64: {{.*}}Proc{{.*}}Sym { ; OBJ64: Kind: S_GPROC32_ID (0x1147) ; OBJ64: CodeSize: 0xE ; OBJ64: DisplayName: y @@ -447,7 +447,7 @@ ; OBJ64: ] ; OBJ64: Subsection [ ; OBJ64-NEXT: SubSectionType: Symbols (0xF1) -; OBJ64: ProcStart { +; OBJ64: {{.*}}Proc{{.*}}Sym { ; OBJ64: Kind: S_GPROC32_ID (0x1147) ; OBJ64: CodeSize: 0x18 ; OBJ64: DisplayName: f diff --git a/llvm/test/DebugInfo/COFF/pieces.ll b/llvm/test/DebugInfo/COFF/pieces.ll index 60330e05772..098f2ae62f0 100644 --- a/llvm/test/DebugInfo/COFF/pieces.ll +++ b/llvm/test/DebugInfo/COFF/pieces.ll @@ -105,21 +105,21 @@ ; ASM: .cv_def_range [[oy_start]] [[oy_end]], "C\021\027\000\000\000\004\000\000\000" -; OBJ-LABEL: ProcStart { +; OBJ-LABEL: {{.*}}Proc{{.*}}Sym { ; OBJ: Kind: S_GPROC32_ID (0x1147) ; OBJ: DisplayName: loop_csr ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: VarName: o ; OBJ: } -; OBJ: DefRangeSubfieldRegister { +; OBJ: DefRangeSubfieldRegisterSym { ; OBJ: Register: 24 ; OBJ: MayHaveNoName: 0 ; OBJ: OffsetInParent: 0 ; OBJ: LocalVariableAddrRange { ; OBJ: } ; OBJ: } -; OBJ: DefRangeSubfieldRegister { +; OBJ: DefRangeSubfieldRegisterSym { ; OBJ: Register: 23 ; OBJ: MayHaveNoName: 0 ; OBJ: OffsetInParent: 4 @@ -135,14 +135,14 @@ ; ASM: .asciz "o" ; ASM: .cv_def_range .Lfunc_begin1 .Lfunc_end1, "C\021\022\000\000\000\004\000\000\000" -; OBJ-LABEL: ProcStart { +; OBJ-LABEL: {{.*}}Proc{{.*}}Sym { ; OBJ: Kind: S_GPROC32_ID (0x1147) ; OBJ: DisplayName: pad_right ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: VarName: o ; OBJ: } -; OBJ: DefRangeSubfieldRegister { +; OBJ: DefRangeSubfieldRegisterSym { ; OBJ: Register: 18 ; OBJ: MayHaveNoName: 0 ; OBJ: OffsetInParent: 4 @@ -158,14 +158,14 @@ ; ASM: .asciz "o" ; ASM: .cv_def_range .Lfunc_begin2 .Lfunc_end2, "C\021\022\000\000\000\000\000\000\000" -; OBJ-LABEL: ProcStart { +; OBJ-LABEL: {{.*}}Proc{{.*}}Sym { ; OBJ: Kind: S_GPROC32_ID (0x1147) ; OBJ: DisplayName: pad_left ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: VarName: o ; OBJ: } -; OBJ: DefRangeSubfieldRegister { +; OBJ: DefRangeSubfieldRegisterSym { ; OBJ: Register: 18 ; OBJ: MayHaveNoName: 0 ; OBJ: OffsetInParent: 0 @@ -185,17 +185,17 @@ ; ASM: .asciz "p" ; ASM: .cv_def_range [[p_start]] .Lfunc_end3, "C\021\021\000\000\000\004\000\000\000" -; OBJ-LABEL: ProcStart { +; OBJ-LABEL: {{.*}}Proc{{.*}}Sym { ; OBJ: Kind: S_GPROC32_ID (0x1147) ; OBJ: DisplayName: nested ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: VarName: o ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: VarName: p ; OBJ: } -; OBJ: DefRangeSubfieldRegister { +; OBJ: DefRangeSubfieldRegisterSym { ; OBJ: Register: 17 ; OBJ: MayHaveNoName: 0 ; OBJ: OffsetInParent: 4 @@ -212,14 +212,14 @@ ; ASM: .asciz "o" ; ASM: .cv_def_range [[spill_o_x_start]] [[spill_o_x_end]], "E\021O\001A\000$\000\000\000" -; OBJ-LABEL: ProcStart { +; OBJ-LABEL: {{.*}}Proc{{.*}}Sym { ; OBJ: Kind: S_GPROC32_ID (0x1147) ; OBJ: DisplayName: bitpiece_spill ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: VarName: o ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 335 ; OBJ: HasSpilledUDTMember: Yes ; OBJ: OffsetInParent: 4 diff --git a/llvm/test/DebugInfo/COFF/register-variables.ll b/llvm/test/DebugInfo/COFF/register-variables.ll index d0ca5ca2afa..f8cd5c4fc3c 100644 --- a/llvm/test/DebugInfo/COFF/register-variables.ll +++ b/llvm/test/DebugInfo/COFF/register-variables.ll @@ -81,17 +81,17 @@ ; OBJ: Subsection [ ; OBJ: SubSectionType: Symbols (0xF1) -; OBJ: ProcStart { +; OBJ: {{.*}}Proc{{.*}}Sym { ; OBJ: DisplayName: f ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x1) ; OBJ: IsParameter (0x1) ; OBJ: ] ; OBJ: VarName: p ; OBJ: } -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 18 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0x0 @@ -99,7 +99,7 @@ ; OBJ: Range: 0x7 ; OBJ: } ; OBJ: } -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 23 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0x7 @@ -107,13 +107,13 @@ ; OBJ: Range: 0x18 ; OBJ: } ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: a ; OBJ: } -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 17 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0xC @@ -121,13 +121,13 @@ ; OBJ: Range: 0x6 ; OBJ: } ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: c ; OBJ: } -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 17 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0xC @@ -135,13 +135,13 @@ ; OBJ: Range: 0x4 ; OBJ: } ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: b ; OBJ: } -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 17 ; OBJ: MayHaveNoName: 0 ; OBJ: OffsetStart: .text+0x12 @@ -149,19 +149,19 @@ ; OBJ: Range: 0x6 ; OBJ: } ; OBJ: } -; OBJ: InlineSite { +; OBJ: InlineSiteSym { ; OBJ: PtrParent: 0x0 ; OBJ: PtrEnd: 0x0 ; OBJ: Inlinee: inlineinc (0x1002) ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x1) ; OBJ: IsParameter (0x1) ; OBJ: ] ; OBJ: VarName: a ; OBJ: } -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 17 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0xC @@ -169,13 +169,13 @@ ; OBJ: Range: 0x6 ; OBJ: } ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x0) ; OBJ: ] ; OBJ: VarName: b ; OBJ: } -; OBJ: DefRangeRegister { +; OBJ: DefRangeRegisterSym { ; OBJ: Register: 17 ; OBJ: LocalVariableAddrRange { ; OBJ: OffsetStart: .text+0x12 diff --git a/llvm/test/DebugInfo/COFF/simple.ll b/llvm/test/DebugInfo/COFF/simple.ll index 3a0b1c9fa7c..50d121be694 100644 --- a/llvm/test/DebugInfo/COFF/simple.ll +++ b/llvm/test/DebugInfo/COFF/simple.ll @@ -77,13 +77,13 @@ ; OBJ32-NEXT: ] ; OBJ32: Subsection [ ; OBJ32-NEXT: SubSectionType: Symbols (0xF1) -; OBJ32: ProcStart { +; OBJ32: {{.*}}Proc{{.*}}Sym { ; OBJ32: CodeSize: 0x6 ; OBJ32: DisplayName: f ; OBJ32: LinkageName: _f ; OBJ32: } ; OBJ32-NEXT: ProcEnd { -; OBJ32-NEXT: } +; OBJ32: } ; OBJ32-NEXT: ] ; OBJ32: FunctionLineTable [ ; OBJ32-NEXT: Name: _f @@ -174,13 +174,13 @@ ; OBJ64-NEXT: ] ; OBJ64: Subsection [ ; OBJ64-NEXT: SubSectionType: Symbols (0xF1) -; OBJ64: ProcStart { +; OBJ64: {{.*}}Proc{{.*}}Sym { ; OBJ64: CodeSize: 0xE ; OBJ64: DisplayName: f ; OBJ64: LinkageName: f ; OBJ64: } ; OBJ64-NEXT: ProcEnd { -; OBJ64-NEXT: } +; OBJ64: } ; OBJ64-NEXT: ] ; OBJ64: FunctionLineTable [ ; OBJ64-NEXT: Name: f diff --git a/llvm/test/DebugInfo/COFF/typedef.ll b/llvm/test/DebugInfo/COFF/typedef.ll index cf4e3df257d..9d841419c56 100644 --- a/llvm/test/DebugInfo/COFF/typedef.ll +++ b/llvm/test/DebugInfo/COFF/typedef.ll @@ -2,7 +2,7 @@ ; CHECK: CodeViewDebugInfo [ ; CHECK: Subsection [ -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: wchar_t (0x71) ; CHECK: Flags [ (0x0) ; CHECK: ] @@ -10,7 +10,7 @@ ; CHECK: } ; CHECK: Subsection [ ; CHECK: SubSectionType: Symbols (0xF1) -; CHECK: UDT { +; CHECK: UDTSym { ; CHECK: Type: wchar_t (0x71) ; CHECK: UDTName: XYZ ; CHECK: } diff --git a/llvm/test/DebugInfo/COFF/types-array.ll b/llvm/test/DebugInfo/COFF/types-array.ll index dca3884b1d0..1a4afa8bd21 100644 --- a/llvm/test/DebugInfo/COFF/types-array.ll +++ b/llvm/test/DebugInfo/COFF/types-array.ll @@ -46,7 +46,7 @@ ; CHECK: Magic: 0x4 ; CHECK: Subsection [ ; CHECK: SubSectionType: Symbols (0xF1) -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: PtrParent: 0x0 ; CHECK: PtrEnd: 0x0 ; CHECK: PtrNext: 0x0 @@ -61,13 +61,13 @@ ; CHECK: DisplayName: f ; CHECK: LinkageName: ?f@@YAXXZ ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: 0x1003 ; CHECK: Flags [ (0x0) ; CHECK: ] ; CHECK: VarName: a ; CHECK: } -; CHECK: DefRangeRegisterRel { +; CHECK: DefRangeRegisterRelSym { ; CHECK: BaseRegister: 22 ; CHECK: HasSpilledUDTMember: No ; CHECK: OffsetInParent: 0 diff --git a/llvm/test/DebugInfo/COFF/types-basic.ll b/llvm/test/DebugInfo/COFF/types-basic.ll index 4ead4bfc1c4..4b9fcd864c2 100644 --- a/llvm/test/DebugInfo/COFF/types-basic.ll +++ b/llvm/test/DebugInfo/COFF/types-basic.ll @@ -218,7 +218,7 @@ ; CHECK: CodeViewDebugInfo [ ; CHECK: Subsection [ ; CHECK: SubSectionType: Symbols (0xF1) -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: DbgStart: 0x0 ; CHECK: DbgEnd: 0x0 ; CHECK: FunctionType: f (0x1002) @@ -229,68 +229,68 @@ ; CHECK: DisplayName: f ; CHECK: LinkageName: ?f@@YAXMN_J@Z ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: float (0x40) ; CHECK: Flags [ (0x1) ; CHECK: IsParameter (0x1) ; CHECK: ] ; CHECK: VarName: p1 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: double (0x41) ; CHECK: Flags [ (0x1) ; CHECK: IsParameter (0x1) ; CHECK: ] ; CHECK: VarName: p2 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: __int64 (0x13) ; CHECK: Flags [ (0x1) ; CHECK: IsParameter (0x1) ; CHECK: ] ; CHECK: VarName: p3 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: int (0x74) ; CHECK: VarName: v1 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: int* (0x674) ; CHECK: VarName: v2 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: const int* (0x1004) ; CHECK: VarName: v21 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: void* (0x603) ; CHECK: VarName: v3 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: int A::* (0x1006) ; CHECK: VarName: v4 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: void A::() A::* (0x100E) ; CHECK: VarName: v5 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: long (0x12) ; CHECK: VarName: l1 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: long (0x12) ; CHECK: VarName: l2 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: unsigned long (0x22) ; CHECK: VarName: l3 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: unsigned long (0x22) ; CHECK: VarName: l4 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: const void* (0x1010) ; CHECK: VarName: v6 ; CHECK: } @@ -298,48 +298,48 @@ ; CHECK: } ; CHECK: ] ; CHECK: Subsection [ -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: Type: CharTypes (0x1012) ; CHECK: DisplayName: CharTypes ; CHECK: LinkageName: ?CharTypes@@YAXXZ ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: wchar_t (0x71) ; CHECK: Flags [ (0x0) ; CHECK: ] ; CHECK: VarName: w ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: unsigned short (0x21) ; CHECK: Flags [ (0x0) ; CHECK: ] ; CHECK: VarName: us ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: char (0x70) ; CHECK: Flags [ (0x0) ; CHECK: ] ; CHECK: VarName: c ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: unsigned char (0x20) ; CHECK: Flags [ (0x0) ; CHECK: ] ; CHECK: VarName: uc ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: signed char (0x10) ; CHECK: Flags [ (0x0) ; CHECK: ] ; CHECK: VarName: sc ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: char16_t (0x7A) ; CHECK: Flags [ (0x0) ; CHECK: ] ; CHECK: VarName: c16 ; CHECK: } -; CHECK: Local { +; CHECK: LocalSym { ; CHECK: Type: char32_t (0x7B) ; CHECK: Flags [ (0x0) ; CHECK: ] diff --git a/llvm/test/DebugInfo/COFF/udts.ll b/llvm/test/DebugInfo/COFF/udts.ll index abc688d70a6..735901f7571 100644 --- a/llvm/test/DebugInfo/COFF/udts.ll +++ b/llvm/test/DebugInfo/COFF/udts.ll @@ -18,37 +18,39 @@ target triple = "i686-pc-windows-msvc18.0.0" ; typedef struct { int x; } U; ; U u; -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: DisplayName: f ; CHECK: LinkageName: ?f@@YAXXZ ; CHECK: } -; CHECK: UDT { +; CHECK: UDTSym { +; CHECK-NEXT: Kind: S_UDT (0x1108) ; CHECK-NEXT: Type: int (0x74) ; CHECK-NEXT: UDTName: f::FOO ; CHECK-NEXT: } ; CHECK-NEXT: ProcEnd { -; CHECK-NEXT: } -; CHECK: ProcStart { +; CHECK: {{.*}}Proc{{.*}}Sym { ; CHECK: DisplayName: g ; CHECK: LinkageName: ?g@@YAMPEAUS@@@Z ; CHECK: } -; CHECK: UDT { +; CHECK: UDTSym { +; CHECK-NEXT: Kind: S_UDT (0x1108) ; CHECK-NEXT: Type: g::pun (0x{{[0-9A-F]+}}) ; CHECK-NEXT: UDTName: g::pun ; CHECK-NEXT: } ; CHECK-NEXT: ProcEnd { -; CHECK-NEXT: } ; CHECK: Subsection -; CHECK-NOT: ProcStart -; CHECK: UDT { +; CHECK-NOT: {{.*}}Proc{{.*}}Sym +; CHECK: UDTSym { +; CHECK-NEXT: Kind: S_UDT (0x1108) ; CHECK-NEXT: Type: S (0x{{[0-9A-F]+}}) ; CHECK-NEXT: UDTName: S -; CHECK: UDT { +; CHECK: UDTSym { +; CHECK-NEXT: Kind: S_UDT (0x1108) ; CHECK-NEXT: Type: <unnamed-tag> (0x{{[0-9A-F]+}}) ; CHECK-NEXT: UDTName: U -; CHECK-NOT: UDT { +; CHECK-NOT: UDTSym { %struct.U = type { i32 } %struct.S = type { i32 } diff --git a/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll b/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll index e3f5c7e629b..e8a310856c1 100644 --- a/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll +++ b/llvm/test/DebugInfo/X86/dbg-declare-inalloca.ll @@ -55,41 +55,41 @@ ; CHECK: .asciz "c" ; CHECK: .cv_def_range [[start]] [[end]] -; OBJ-LABEL: ProcStart { +; OBJ-LABEL: {{.*}}Proc{{.*}}Sym { ; OBJ: Kind: S_GPROC32_ID (0x1147) ; OBJ: DisplayName: f ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: NonTrivial (0x1007) ; OBJ: Flags [ (0x1) ; OBJ: IsParameter (0x1) ; OBJ: ] ; OBJ: VarName: a ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 21 ; OBJ: BasePointerOffset: 12 ; OBJ: } -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x1) ; OBJ: IsParameter (0x1) ; OBJ: ] ; OBJ: VarName: b ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 21 ; OBJ: BasePointerOffset: 16 ; OBJ: } ; FIXME: Retain unused. -; OBJ: Local { +; OBJ: LocalSym { ; OBJ: Type: int (0x74) ; OBJ: Flags [ (0x1) ; OBJ: IsParameter (0x1) ; OBJ: ] ; OBJ: VarName: c ; OBJ: } -; OBJ: DefRangeRegisterRel { +; OBJ: DefRangeRegisterRelSym { ; OBJ: BaseRegister: 21 ; OBJ: BasePointerOffset: 24 ; OBJ: } |
