[LLDB] - Update the test cases after yaml2obj change.

https://reviews.llvm.org/D60122 (r357595) changed the
symbols description format in yaml2obj.

This change updates the LLDB tests.

llvm-svn: 357600

9 files changed, 184 insertions, 176 deletions

diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml b/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
index acacc9b9537..1e304e5fc46 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
+++ b/lldb/lit/Breakpoint/Inputs/split-dwarf-5-addrbase.dwo.yaml
@@ -30,6 +30,4 @@ Sections:
     Flags:           [ SHF_EXCLUDE ]
     AddressAlign:    0x0000000000000001
     Content:         011101B042252525130503250000022E00111B120640186E2503253A0B3B0B3F190000032E00111B1206401803253A0B3B0B49133F19000004240003253E0B0B0B000000
-Symbols:         {}
-DynamicSymbols:  {}
 ...
diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml b/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
index 6346f6c8eac..fbcb9a24921 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
+++ b/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file1.dwo.yaml
@@ -35,6 +35,4 @@ Sections:
     Flags:           [ SHF_EXCLUDE ]
     AddressAlign:    0x0000000000000001
     Content:         150000000500080001000000040000000101040C1F04253200
-Symbols:         {}
-DynamicSymbols:  {}
 ...
diff --git a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml b/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
index b506415ef8b..ef06915cddc 100644
--- a/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
+++ b/lldb/lit/Breakpoint/Inputs/split-dwarf5-debug-stroffsets-file2.dwo.yaml
@@ -35,6 +35,4 @@ Sections:
     Flags:           [ SHF_EXCLUDE ]
     AddressAlign:    0x0000000000000001
     Content:         150000000500080001000000040000000100040C1F04253200
-Symbols:         {}
-DynamicSymbols:  {}
 ...
diff --git a/lldb/lit/Modules/ELF/build-id-case.yaml b/lldb/lit/Modules/ELF/build-id-case.yaml
index 843bc40fb79..c95ffbd7ffd 100644
--- a/lldb/lit/Modules/ELF/build-id-case.yaml
+++ b/lldb/lit/Modules/ELF/build-id-case.yaml
@@ -32,10 +32,9 @@ Sections:
     AddressAlign:    0x0000000000000008
     Content:         DEADBEEFBAADF00D
 Symbols:
-  Local:
-    - Name:            main
-      Type:            STT_FUNC
-      Section:         .text
-      Value:           0x00000000004003D0
-      Size:            0x0000000000000008
+  - Name:            main
+    Type:            STT_FUNC
+    Section:         .text
+    Value:           0x00000000004003D0
+    Size:            0x0000000000000008
 ...
diff --git a/lldb/lit/Modules/ELF/duplicate-section.yaml b/lldb/lit/Modules/ELF/duplicate-section.yaml
index b4b391cc912..8b280d2449b 100644
--- a/lldb/lit/Modules/ELF/duplicate-section.yaml
+++ b/lldb/lit/Modules/ELF/duplicate-section.yaml
@@ -33,10 +33,9 @@ Sections:
     AddressAlign:    0x0000000000000008
     Content:         DEADBEEFBAADF00D
 Symbols:
-  Local:
-    - Name:            main
-      Type:            STT_FUNC
-      Section:         .text
-      Value:           0x00000000004003D0
-      Size:            0x0000000000000008
+  - Name:            main
+    Type:            STT_FUNC
+    Section:         .text
+    Value:           0x00000000004003D0
+    Size:            0x0000000000000008
 ...
diff --git a/lldb/unittests/Core/Inputs/mangled-function-names.yaml b/lldb/unittests/Core/Inputs/mangled-function-names.yaml
index 56fc9bdc362..9fb6289fa90 100644
--- a/lldb/unittests/Core/Inputs/mangled-function-names.yaml
+++ b/lldb/unittests/Core/Inputs/mangled-function-names.yaml
@@ -33,84 +33,97 @@ Sections:
     Flags:           [ SHF_MERGE, SHF_STRINGS ]
     AddressAlign:    0x0000000000000001
     Content:         5562756E747520636C616E672076657273696F6E20332E352D317562756E74753120287472756E6B2920286261736564206F6E204C4C564D20332E352900
-Symbols:         
-  Local:           
-    - Type:            STT_SECTION
-      Section:         .text
-    - Type:            STT_SECTION
-      Section:         .anothertext
-      Value:           0x0000000000000010
-    - Type:            STT_SECTION
-      Section:         .eh_frame
-      Value:           0x0000000000000050
-    - Type:            STT_SECTION
-      Section:         .data
-      Value:           0x00000000000000A8
-    - Type:            STT_SECTION
-      Section:         .comment
-    - Name:            /tmp/a.c
-      Type:            STT_FILE
-    - Type:            STT_FILE
-  Global:          
-    - Name:            somedata
-      Type:            STT_OBJECT
-      Section:         .anothertext
-      Value:           0x0000000000000045
-    - Name:            main
-      Type:            STT_FUNC
-      Section:         .anothertext
-      Value:           0x0000000000000010
-      Size:            0x000000000000003F
-    - Name:            _Z3foov
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            puts@GLIBC_2.5
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            puts@GLIBC_2.6
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _Z5annotv@VERSION3
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _ZN1AC2Ev
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _ZN1AD2Ev
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _ZN1A3barEv
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _ZGVZN4llvm4dbgsEvE7thestrm
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _ZZN4llvm4dbgsEvE7thestrm
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _ZTVN5clang4DeclE
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            -[ObjCfoo]
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            +[B ObjCbar(WithCategory)]
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
-    - Name:            _Z12undemangableEvx42
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x000000000000000D
+Symbols:
+  - Type:            STT_SECTION
+    Section:         .text
+  - Type:            STT_SECTION
+    Section:         .anothertext
+    Value:           0x0000000000000010
+  - Type:            STT_SECTION
+    Section:         .eh_frame
+    Value:           0x0000000000000050
+  - Type:            STT_SECTION
+    Section:         .data
+    Value:           0x00000000000000A8
+  - Type:            STT_SECTION
+    Section:         .comment
+  - Name:            /tmp/a.c
+    Type:            STT_FILE
+  - Type:            STT_FILE          
+  - Name:            somedata
+    Type:            STT_OBJECT
+    Section:         .anothertext
+    Value:           0x0000000000000045
+    Binding:         STB_GLOBAL
+  - Name:            main
+    Type:            STT_FUNC
+    Section:         .anothertext
+    Value:           0x0000000000000010
+    Size:            0x000000000000003F
+    Binding:         STB_GLOBAL
+  - Name:            _Z3foov
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            puts@GLIBC_2.5
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            puts@GLIBC_2.6
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _Z5annotv@VERSION3
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _ZN1AC2Ev
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _ZN1AD2Ev
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _ZN1A3barEv
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _ZGVZN4llvm4dbgsEvE7thestrm
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _ZZN4llvm4dbgsEvE7thestrm
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _ZTVN5clang4DeclE
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            -[ObjCfoo]
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            +[B ObjCbar(WithCategory)]
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
+  - Name:            _Z12undemangableEvx42
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x000000000000000D
+    Binding:         STB_GLOBAL
 ...
diff --git a/lldb/unittests/ObjectFile/ELF/Inputs/debug-info-relocations.pcm.yaml b/lldb/unittests/ObjectFile/ELF/Inputs/debug-info-relocations.pcm.yaml
index 10bf9c2d177..10f5e59432f 100644
--- a/lldb/unittests/ObjectFile/ELF/Inputs/debug-info-relocations.pcm.yaml
+++ b/lldb/unittests/ObjectFile/ELF/Inputs/debug-info-relocations.pcm.yaml
@@ -133,51 +133,50 @@ Sections:
         Symbol:          .text
         Type:            R_AARCH64_ABS64
 Symbols:         
-  Local:           
-    - Name:            reduced.h
-      Type:            STT_FILE
-    - Name:            '$d.1'
-      Section:         .debug_str
-    - Name:            '$d.2'
-      Section:         .debug_abbrev
-    - Name:            '$d.3'
-      Section:         .debug_info
-    - Name:            '$d.4'
-      Section:         .debug_macinfo
-    - Name:            '$d.5'
-      Section:         .debug_pubnames
-    - Name:            '$d.6'
-      Section:         .debug_pubtypes
-    - Name:            '$d.7'
-      Section:         .comment
-    - Name:            '$d.8'
-      Section:         .debug_frame
-    - Name:            '$d.9'
-      Section:         .debug_line
-    - Name:            '$x.0'
-      Section:         .text
-    - Name:            .text
-      Type:            STT_SECTION
-      Section:         .text
-    - Name:            .debug_str
-      Type:            STT_SECTION
-      Section:         .debug_str
-    - Name:            .debug_abbrev
-      Type:            STT_SECTION
-      Section:         .debug_abbrev
-    - Name:            .debug_info
-      Type:            STT_SECTION
-      Section:         .debug_info
-    - Name:            .debug_frame
-      Type:            STT_SECTION
-      Section:         .debug_frame
-    - Name:            .debug_line
-      Type:            STT_SECTION
-      Section:         .debug_line
-  Global:          
-    - Name:            f
-      Type:            STT_FUNC
-      Section:         .text
-      Size:            0x0000000000000008
+  - Name:            reduced.h
+    Type:            STT_FILE
+  - Name:            '$d.1'
+    Section:         .debug_str
+  - Name:            '$d.2'
+    Section:         .debug_abbrev
+  - Name:            '$d.3'
+    Section:         .debug_info
+  - Name:            '$d.4'
+    Section:         .debug_macinfo
+  - Name:            '$d.5'
+    Section:         .debug_pubnames
+  - Name:            '$d.6'
+    Section:         .debug_pubtypes
+  - Name:            '$d.7'
+    Section:         .comment
+  - Name:            '$d.8'
+    Section:         .debug_frame
+  - Name:            '$d.9'
+    Section:         .debug_line
+  - Name:            '$x.0'
+    Section:         .text
+  - Name:            .text
+    Type:            STT_SECTION
+    Section:         .text
+  - Name:            .debug_str
+    Type:            STT_SECTION
+    Section:         .debug_str
+  - Name:            .debug_abbrev
+    Type:            STT_SECTION
+    Section:         .debug_abbrev
+  - Name:            .debug_info
+    Type:            STT_SECTION
+    Section:         .debug_info
+  - Name:            .debug_frame
+    Type:            STT_SECTION
+    Section:         .debug_frame
+  - Name:            .debug_line
+    Type:            STT_SECTION
+    Section:         .debug_line
+  - Name:            f
+    Type:            STT_FUNC
+    Section:         .text
+    Size:            0x0000000000000008
+    Binding:         STB_GLOBAL
 DynamicSymbols:  
 ...
diff --git a/lldb/unittests/ObjectFile/ELF/Inputs/sections-resolve-consistently.yaml b/lldb/unittests/ObjectFile/ELF/Inputs/sections-resolve-consistently.yaml
index 98b68bd2773..8a4bcd24a07 100644
--- a/lldb/unittests/ObjectFile/ELF/Inputs/sections-resolve-consistently.yaml
+++ b/lldb/unittests/ObjectFile/ELF/Inputs/sections-resolve-consistently.yaml
@@ -31,20 +31,22 @@ Sections:
     AddressAlign:    0x0000000000000004
     Size:            0x0000000000000004
 Symbols:
-  Global:
-    - Name:            Y
-      Type:            STT_OBJECT
-      Section:         .data
-      Value:           0x0000000000601000
-      Size:            0x0000000000000004
-    - Name:            _start
-      Type:            STT_FUNC
-      Section:         .text
-      Value:           0x0000000000400180
-      Size:            0x0000000000000014
-    - Name:            X
-      Type:            STT_OBJECT
-      Section:         .bss
-      Value:           0x0000000000601004
-      Size:            0x0000000000000004
+  - Name:            Y
+    Type:            STT_OBJECT
+    Section:         .data
+    Value:           0x0000000000601000
+    Size:            0x0000000000000004
+    Binding:         STB_GLOBAL
+  - Name:            _start
+    Type:            STT_FUNC
+    Section:         .text
+    Value:           0x0000000000400180
+    Size:            0x0000000000000014
+    Binding:         STB_GLOBAL
+  - Name:            X
+    Type:            STT_OBJECT
+    Section:         .bss
+    Value:           0x0000000000601004
+    Size:            0x0000000000000004
+    Binding:         STB_GLOBAL
 ...
diff --git a/lldb/unittests/Symbol/Inputs/basic-call-frame-info.yaml b/lldb/unittests/Symbol/Inputs/basic-call-frame-info.yaml
index 7bd8a48b87d..7f58b6e93c9 100644
--- a/lldb/unittests/Symbol/Inputs/basic-call-frame-info.yaml
+++ b/lldb/unittests/Symbol/Inputs/basic-call-frame-info.yaml
@@ -119,20 +119,22 @@ Sections:
 #  DW_CFA_advance_loc: 3 to 0000000000000284
 #  DW_CFA_def_cfa_register: r6 (rbp)
 Symbols:
-  Global:
-    - Name:            eh_frame
-      Type:            STT_FUNC
-      Section:         .text
-      Value:           0x0000000000000260
-      Size:            0x000000000000000C
-    - Name:            debug_frame3
-      Type:            STT_FUNC
-      Section:         .text
-      Value:           0x0000000000000270
-      Size:            0x000000000000000C
-    - Name:            debug_frame4
-      Type:            STT_FUNC
-      Section:         .text
-      Value:           0x0000000000000280
-      Size:            0x000000000000000C
+  - Name:            eh_frame
+    Type:            STT_FUNC
+    Section:         .text
+    Value:           0x0000000000000260
+    Size:            0x000000000000000C
+    Binding:         STB_GLOBAL
+  - Name:            debug_frame3
+    Type:            STT_FUNC
+    Section:         .text
+    Value:           0x0000000000000270
+    Size:            0x000000000000000C
+    Binding:         STB_GLOBAL
+  - Name:            debug_frame4
+    Type:            STT_FUNC
+    Section:         .text
+    Value:           0x0000000000000280
+    Size:            0x000000000000000C
+    Binding:         STB_GLOBAL
 ...