[WebAssembly] Update YAML in tests to match LLVM change

Differential Revision: https://reviews.llvm.org/D41878

llvm-svn: 322122

12 files changed, 361 insertions, 182 deletions

diff --git a/lld/test/wasm/call-indirect.ll b/lld/test/wasm/call-indirect.ll
index 2b838a8efa4..51a80455db3 100644
--- a/lld/test/wasm/call-indirect.ll
+++ b/lld/test/wasm/call-indirect.ll
@@ -65,7 +65,8 @@ define void @call_ptr(i64 (i64)* %arg) {
 ; CHECK-NEXT:       - Initial:         0x00000002
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -98,15 +99,20 @@ define void @call_ptr(i64 (i64)* %arg) {
 ; CHECK-NEXT:         Functions:       [ 0, 2 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41010B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            410028028088808000118080808000001A0B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41020B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            410028028888808000118080808000001A41000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            42012000118380808000001A0B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
diff --git a/lld/test/wasm/data-layout.ll b/lld/test/wasm/data-layout.ll
index 2300b362a55..a32e78849b6 100644
--- a/lld/test/wasm/data-layout.ll
+++ b/lld/test/wasm/data-layout.ll
@@ -11,27 +11,32 @@
 
 ; CHECK:        - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           66608
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1024
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1040
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           1048
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
diff --git a/lld/test/wasm/function-imports-first.ll b/lld/test/wasm/function-imports-first.ll
index eda1302703c..aa7114a0fc4 100644
--- a/lld/test/wasm/function-imports-first.ll
+++ b/lld/test/wasm/function-imports-first.ll
@@ -25,9 +25,11 @@ declare i32 @ret32(float) local_unnamed_addr #1
 ; CHECK-NEXT:    FunctionTypes: [ 0, 1 ]
 ; CHECK:  - Type:            CODE
 ; CHECK-NEXT:    Functions:
-; CHECK-NEXT:      - Locals:
+; CHECK-NEXT:      - Index:           0
+; CHECK-NEXT:        Locals:
 ; CHECK-NEXT:        Body:            43000000001081808080001A0B
-; CHECK-NEXT:      - Locals:
+; CHECK-NEXT:      - Index:           1
+; CHECK-NEXT:        Locals:
 ; CHECK-NEXT:        Body:            41000B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            linking
diff --git a/lld/test/wasm/function-imports.ll b/lld/test/wasm/function-imports.ll
index 072554d8400..2a23bf8d5db 100644
--- a/lld/test/wasm/function-imports.ll
+++ b/lld/test/wasm/function-imports.ll
@@ -26,8 +26,8 @@ declare i32 @ret32(float) local_unnamed_addr #1
 ; CHECK-NEXT:    FunctionTypes:   [ 0, 1 ]
 ; CHECK:       - Type:            CODE
 ; CHECK-NEXT:    Functions:
-; CHECK:           - Locals:
-; CHECK:           - Locals:
+; CHECK:           - Index:       0
+; CHECK:           - Index:       1
 ; CHECK:         Name:            name
 ; CHECK-NEXT:    FunctionNames:
 ; CHECK-NEXT:      - Index:           0
diff --git a/lld/test/wasm/local-symbols.ll b/lld/test/wasm/local-symbols.ll
index e88f656e14c..fdb56e67622 100644
--- a/lld/test/wasm/local-symbols.ll
+++ b/lld/test/wasm/local-symbols.ll
@@ -38,7 +38,8 @@ entry:
 ; CHECK-NEXT:       - Initial:         0x00000002
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -53,9 +54,11 @@ entry:
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41020B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41010B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
diff --git a/lld/test/wasm/many-functions.ll b/lld/test/wasm/many-functions.ll
index f21298d862d..4b69a423de6 100644
--- a/lld/test/wasm/many-functions.ll
+++ b/lld/test/wasm/many-functions.ll
@@ -406,266 +406,396 @@ entry:
 ; CHECK-NEXT:       - Type:            R_WEBASSEMBLY_FUNCTION_INDEX_LEB
 ; CHECK-NEXT:         Index:           129
 ; CHECK-NEXT:         Offset:          0x00000611
-; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:     Functions:       
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           6
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           7
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           8
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           9
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           10
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           11
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           12
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           13
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           14
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           15
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           16
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           17
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           18
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           19
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           20
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           21
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           22
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           23
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           24
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           25
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           26
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           27
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           28
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           29
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           30
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           31
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           32
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           33
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           34
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           35
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           36
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           37
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           38
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           39
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           40
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           41
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           42
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           43
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           44
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           45
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           46
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           47
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           48
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           49
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           50
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           51
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           52
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           53
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           54
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           55
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           56
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           57
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           58
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           59
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           60
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           61
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           62
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           63
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           64
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           65
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           66
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           67
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           68
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           69
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           70
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           71
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           72
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           73
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           74
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           75
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           76
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           77
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           78
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           79
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           80
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           81
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           82
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           83
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           84
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           85
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           86
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           87
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           88
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           89
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           90
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           91
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           92
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           93
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           94
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           95
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           96
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           97
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           98
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           99
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           100
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           101
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           102
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           103
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           104
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           105
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           106
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           107
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           108
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           109
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           110
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           111
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           112
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           113
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           114
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           115
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           116
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           117
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           118
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           119
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           120
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           121
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           122
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           123
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           124
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           125
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           126
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280284808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           127
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280280808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           128
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            4100280280808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           129
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:         Body:            1081818080000B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
diff --git a/lld/test/wasm/relocatable.ll b/lld/test/wasm/relocatable.ll
index ce006a71d35..a42d622107a 100644
--- a/lld/test/wasm/relocatable.ll
+++ b/lld/test/wasm/relocatable.ll
@@ -62,22 +62,26 @@ declare i32 @foo_import() local_unnamed_addr
 ; CHECK-NEXT:       - Initial:         0x00000001
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           0
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           8
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
 ; CHECK-NEXT:           Value:           12
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -120,9 +124,11 @@ declare i32 @foo_import() local_unnamed_addr
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:         Offset:          0x00000013
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:         2
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:          4180808080001080808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:         3
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:          1081808080001A41010B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Relocations:
diff --git a/lld/test/wasm/stack-pointer.ll b/lld/test/wasm/stack-pointer.ll
index c5be94af4e3..7254b860f21 100644
--- a/lld/test/wasm/stack-pointer.ll
+++ b/lld/test/wasm/stack-pointer.ll
@@ -32,7 +32,8 @@ entry:
 ; CHECK-NEXT:       - Initial:         0x00000002
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -51,7 +52,8 @@ entry:
 ; CHECK-NEXT:         Index:           0
 ; CHECK-NEXT:         Offset:          0x00000004
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            23808080800041106B1A41000B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            linking
diff --git a/lld/test/wasm/weak-alias-overide.ll b/lld/test/wasm/weak-alias-overide.ll
index c2f673a5272..a96fec7b4a6 100644
--- a/lld/test/wasm/weak-alias-overide.ll
+++ b/lld/test/wasm/weak-alias-overide.ll
@@ -43,7 +43,8 @@ entry:
 ; CHECK-NEXT:       - Initial:         0x00000002
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -82,21 +83,28 @@ entry:
 ; CHECK-NEXT:         Functions:       [ 0, 2 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41010B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            1080808080001A0B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            1082808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            1080808080000B
-; CHECK-NEXT:       - Locals:          
+; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:           - Type:            I32
 ; CHECK-NEXT:             Count:           2
 ; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081080808080002101200041106A24808080800020010B
-; CHECK-NEXT:       - Locals:          
+; CHECK-NEXT:       - Index:           6
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:           - Type:            I32
 ; CHECK-NEXT:             Count:           2
 ; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004182808080003602081082808080002101200041106A24808080800020010B
diff --git a/lld/test/wasm/weak-alias.ll b/lld/test/wasm/weak-alias.ll
index 6a345ec0c63..d011c4bfd81 100644
--- a/lld/test/wasm/weak-alias.ll
+++ b/lld/test/wasm/weak-alias.ll
@@ -37,7 +37,8 @@ entry:
 ; CHECK-NEXT:       - Initial:         0x00000002
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -76,19 +77,25 @@ entry:
 ; CHECK-NEXT:         Functions:       [ 1, 1 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            1081808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            1081808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            1081808080000B
-; CHECK-NEXT:       - Locals:          
+; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:           - Type:            I32
 ; CHECK-NEXT:             Count:           2
 ; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004181808080003602081081808080002101200041106A24808080800020010B
-; CHECK-NEXT:       - Locals:          
+; CHECK-NEXT:       - Index:           5
+; CHECK-NEXT:         Locals:          
 ; CHECK-NEXT:           - Type:            I32
 ; CHECK-NEXT:             Count:           2
 ; CHECK-NEXT:         Body:            23808080800041106B220024808080800020004182808080003602081081808080002101200041106A24808080800020010B
diff --git a/lld/test/wasm/weak-symbols.ll b/lld/test/wasm/weak-symbols.ll
index 4e4e2edfa9b..0d461cba864 100644
--- a/lld/test/wasm/weak-symbols.ll
+++ b/lld/test/wasm/weak-symbols.ll
@@ -37,7 +37,8 @@ entry:
 ; CHECK-NEXT:       - Initial:         0x00000002
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -67,15 +68,20 @@ entry:
 ; CHECK-NEXT:         Functions:       [ 1 ]
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            1081808080001A4100280280888080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41010B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4181808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           3
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            41020B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           4
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4181808080000B
 ; CHECK-NEXT:   - Type:            DATA
 ; CHECK-NEXT:     Segments:
diff --git a/lld/test/wasm/weak-undefined.ll b/lld/test/wasm/weak-undefined.ll
index 36b842e32d7..e5f0930bdf1 100644
--- a/lld/test/wasm/weak-undefined.ll
+++ b/lld/test/wasm/weak-undefined.ll
@@ -47,7 +47,8 @@ entry:
 ; CHECK-NEXT:       - Initial:         0x00000002
 ; CHECK-NEXT:   - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
-; CHECK-NEXT:       - Type:            I32
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -68,11 +69,14 @@ entry:
 ; CHECK-NEXT:         Index:           1
 ; CHECK-NEXT:   - Type:            CODE
 ; CHECK-NEXT:     Functions:
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           0
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4180808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           1
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4180808080000B
-; CHECK-NEXT:       - Locals:
+; CHECK-NEXT:       - Index:           2
+; CHECK-NEXT:         Locals:
 ; CHECK-NEXT:         Body:            4100280280808080000B
 ; CHECK-NEXT:   - Type:            CUSTOM
 ; CHECK-NEXT:     Name:            linking