[lld][WebAssembly] Only include __stack_pointer when needed by sbc100 · Pull Request #199739 · llvm/llvm-project

sbc100 · 2026-05-26T18:25:46Z

No description provided.

llvmorg-github-actions · 2026-05-26T18:26:34Z

@llvm/pr-subscribers-lld-wasm

@llvm/pr-subscribers-lld

Author: Sam Clegg (sbc100)

Changes

Patch is 30.46 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/199739.diff

29 Files Affected:

(modified) lld/test/wasm/alias.s (-11)
(modified) lld/test/wasm/build-id.test (+6-6)
(modified) lld/test/wasm/ctor-return-value.s (-3)
(modified) lld/test/wasm/duplicate-global-imports.s (-2)
(modified) lld/test/wasm/export-optional.s (+1-1)
(modified) lld/test/wasm/externref.s (-6)
(modified) lld/test/wasm/function-imports-first.ll (-3)
(modified) lld/test/wasm/function-imports.s (-3)
(modified) lld/test/wasm/gc-imports.s (-2)
(modified) lld/test/wasm/gc-sections.ll (+1-9)
(modified) lld/test/wasm/global-base.test (+6-18)
(modified) lld/test/wasm/globals.s (+4-10)
(modified) lld/test/wasm/lto/tls.ll (-8)
(modified) lld/test/wasm/map-file.s (+18-19)
(modified) lld/test/wasm/merge-string-debug.s (+7-7)
(modified) lld/test/wasm/mutable-global-exports.s (+1-1)
(modified) lld/test/wasm/name-section-mangling.s (-3)
(modified) lld/test/wasm/signature-mismatch-export.ll (-3)
(modified) lld/test/wasm/signature-mismatch.s (-3)
(modified) lld/test/wasm/stack-first.test (+5-17)
(modified) lld/test/wasm/startstop.ll (+6-6)
(modified) lld/test/wasm/table-base.s (+2-14)
(modified) lld/test/wasm/tag-section.ll (+3-1)
(modified) lld/test/wasm/tls-base-non-shared-memory.s (-8)
(modified) lld/test/wasm/undefined-weak-call.s (-11)
(modified) lld/test/wasm/unresolved-symbols-dynamic.s (-2)
(modified) lld/test/wasm/weak-undefined-pic.s (+1-9)
(modified) lld/test/wasm/weak-undefined.s (-8)
(modified) lld/wasm/Driver.cpp (-1)

diff --git a/lld/test/wasm/alias.s b/lld/test/wasm/alias.s
index 83f40a8369921..427f0bbc17d68 100644
--- a/lld/test/wasm/alias.s
+++ b/lld/test/wasm/alias.s
@@ -25,14 +25,6 @@ _start:
 # CHECK-NEXT:   - Type:            MEMORY
 # CHECK-NEXT:     Memories:
 # CHECK-NEXT:       - Minimum:         0x1
-# CHECK-NEXT:   - Type:            GLOBAL
-# CHECK-NEXT:     Globals:
-# CHECK-NEXT:       - Index:           0
-# CHECK-NEXT:         Type:            I32
-# CHECK-NEXT:         Mutable:         true
-# CHECK-NEXT:         InitExpr:
-# CHECK-NEXT:           Opcode:          I32_CONST
-# CHECK-NEXT:           Value:           65536
 # CHECK-NEXT:   - Type:            EXPORT
 # CHECK-NEXT:     Exports:
 # CHECK-NEXT:       - Name:            memory
@@ -54,7 +46,4 @@ _start:
 # CHECK-NEXT:     FunctionNames:
 # CHECK-NEXT:       - Index:           0
 # CHECK-NEXT:         Name:            _start
-# CHECK-NEXT:     GlobalNames:
-# CHECK-NEXT:       - Index:           0
-# CHECK-NEXT:         Name:            __stack_pointer
 # CHECK-NEXT: ...
diff --git a/lld/test/wasm/build-id.test b/lld/test/wasm/build-id.test
index 5fafd21d32240..8d0fb0293f551 100644
--- a/lld/test/wasm/build-id.test
+++ b/lld/test/wasm/build-id.test
@@ -43,18 +43,18 @@ foo:
 
 
 # DEFAULT:      Contents of section build_id:
-# DEFAULT-NEXT: 0079 103f86e6 3bb81959 2e99ffa9 acfed331 .?..;..Y.......1
-# DEFAULT-NEXT: 0089 3a
+# DEFAULT-NEXT: 005b 104d7593 76cce050 6db31eff 76e5f762 .Mu.v..Pm...v..b
+# DEFAULT-NEXT: 006b e0                                 .
 
 # SHA1:      Contents of section build_id:
-# SHA1-NEXT: 0079 1410ade4 e75d1c9d 71023465 03b7572f .....]..q.4e..W/
-# SHA1-NEXT: 0089 c06c5ae0 74                          .lZ.t
+# SHA1-NEXT: 005b 14b1ac8d 72e31051 2facff88 ff9b81cc ....r..Q/.......
+# SHA1-NEXT: 006b f332c211 7e                          .2..~
 
 # UUID:      Contents of section build_id:
-# UUID-NEXT: 0079 10
+# UUID-NEXT: 005b 10
 
 # HEX:      Contents of section build_id:
-# HEX-NEXT:  0079 04123456 78                          ..4Vx
+# HEX-NEXT:  005b 04123456 78                          ..4Vx
 
 
 # NONE-NOT: Contents of section build_id:
diff --git a/lld/test/wasm/ctor-return-value.s b/lld/test/wasm/ctor-return-value.s
index 1943306c88f90..067de0b700917 100644
--- a/lld/test/wasm/ctor-return-value.s
+++ b/lld/test/wasm/ctor-return-value.s
@@ -45,7 +45,4 @@ _start:
 # CHECK-NEXT:         Name:            myctor
 # CHECK-NEXT:       - Index:           2
 # CHECK-NEXT:         Name:            _start
-# CHECK-NEXT:     GlobalNames:
-# CHECK-NEXT:       - Index:           0
-# CHECK-NEXT:         Name:            __stack_pointer
 # CHECK-NEXT: ...
diff --git a/lld/test/wasm/duplicate-global-imports.s b/lld/test/wasm/duplicate-global-imports.s
index 8f057cd4f19e1..49f0ae7726105 100644
--- a/lld/test/wasm/duplicate-global-imports.s
+++ b/lld/test/wasm/duplicate-global-imports.s
@@ -65,5 +65,3 @@ _start:
 # CHECK-NEXT:        Name:            g3
 # CHECK-NEXT:      - Index:           2
 # CHECK-NEXT:        Name:            g4
-# CHECK-NEXT:      - Index:           3
-# CHECK-NEXT:        Name:            __stack_pointer
diff --git a/lld/test/wasm/export-optional.s b/lld/test/wasm/export-optional.s
index 1509715238312..f82a393730724 100644
--- a/lld/test/wasm/export-optional.s
+++ b/lld/test/wasm/export-optional.s
@@ -29,4 +29,4 @@ foo:
 # CHECK-NEXT:        Index:           0
 # CHECK-NEXT:      - Name:            __start_foo
 # CHECK-NEXT:        Kind:            GLOBAL
-# CHECK-NEXT:        Index:           1
+# CHECK-NEXT:        Index:           0
diff --git a/lld/test/wasm/externref.s b/lld/test/wasm/externref.s
index 1443e5f7fda5f..d64441fe54b97 100644
--- a/lld/test/wasm/externref.s
+++ b/lld/test/wasm/externref.s
@@ -31,12 +31,6 @@ _start:
 #      CHECK:  - Type:            GLOBAL
 # CHECK-NEXT:    Globals:
 # CHECK-NEXT:      - Index:           0
-# CHECK-NEXT:        Type:            I32
-# CHECK-NEXT:        Mutable:         true
-# CHECK-NEXT:        InitExpr:
-# CHECK-NEXT:          Opcode:          I32_CONST
-# CHECK-NEXT:          Value:           65536
-# CHECK-NEXT:      - Index:           1
 # CHECK-NEXT:        Type:            EXTERNREF
 # CHECK-NEXT:        Mutable:         true
 # CHECK-NEXT:        InitExpr:
diff --git a/lld/test/wasm/function-imports-first.ll b/lld/test/wasm/function-imports-first.ll
index b4e984092f82d..3a503cbe06371 100644
--- a/lld/test/wasm/function-imports-first.ll
+++ b/lld/test/wasm/function-imports-first.ll
@@ -41,7 +41,4 @@ declare i32 @ret32(float) local_unnamed_addr #1
 ; CHECK-NEXT:         Name:            _start
 ; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            ret32
-; CHECK-NEXT:     GlobalNames:
-; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __stack_pointer
 ; CHECK-NEXT: ...
diff --git a/lld/test/wasm/function-imports.s b/lld/test/wasm/function-imports.s
index 825747849fff2..e303fbf820077 100644
--- a/lld/test/wasm/function-imports.s
+++ b/lld/test/wasm/function-imports.s
@@ -36,7 +36,4 @@ _start:
 # CHECK-NEXT:        Name:            ret32
 # CHECK-NEXT:      - Index:           1
 # CHECK-NEXT:        Name:            _start
-# CHECK-NEXT:    GlobalNames:
-# CHECK-NEXT:      - Index:           0
-# CHECK-NEXT:        Name:            __stack_pointer
 # CHECK-NEXT: ...
diff --git a/lld/test/wasm/gc-imports.s b/lld/test/wasm/gc-imports.s
index 4e6053b5caf2c..69a0ae11eee95 100644
--- a/lld/test/wasm/gc-imports.s
+++ b/lld/test/wasm/gc-imports.s
@@ -48,8 +48,6 @@ _start:
 # CHECK-NEXT:     GlobalNames:
 # CHECK-NEXT:       - Index:           0
 # CHECK-NEXT:         Name:            used_undef_global
-# CHECK-NEXT:       - Index:           1
-# CHECK-NEXT:         Name:            __stack_pointer
 # CHECK-NEXT: ...
 
 # RUN: wasm-ld --no-gc-sections --allow-undefined \
diff --git a/lld/test/wasm/gc-sections.ll b/lld/test/wasm/gc-sections.ll
index 69d7ed2105cf7..b7322b55a19e1 100644
--- a/lld/test/wasm/gc-sections.ll
+++ b/lld/test/wasm/gc-sections.ll
@@ -53,15 +53,9 @@ entry:
 ; CHECK:        - Type:            GLOBAL
 ; CHECK-NEXT:     Globals:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Type:            I32
+; CHECK-NEXT:         Type:            I64
 ; CHECK-NEXT:         Mutable:         true
 ; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           65536
-; CHECK-NEXT:       - Index:       1
-; CHECK-NEXT:         Type:        I64
-; CHECK-NEXT:         Mutable:     true
-; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I64_CONST
 ; CHECK-NEXT:           Value:           456
 
@@ -84,8 +78,6 @@ entry:
 ; CHECK-NEXT:         Name:            use_global
 ; CHECK-NEXT:     GlobalNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __stack_pointer
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            used_global
 ; CHECK-NEXT:     DataSegmentNames:
 ; CHECK-NEXT:       - Index:           0
diff --git a/lld/test/wasm/global-base.test b/lld/test/wasm/global-base.test
index d94446a7638bf..490a4db782500 100644
--- a/lld/test/wasm/global-base.test
+++ b/lld/test/wasm/global-base.test
@@ -16,17 +16,11 @@ CHECK-1024:       - Type:            GLOBAL
 CHECK-1024-NEXT:    Globals:
 CHECK-1024-NEXT:      - Index:           0
 CHECK-1024-NEXT:        Type:            I32
-CHECK-1024-NEXT:        Mutable:         true
-CHECK-1024-NEXT:        InitExpr:
-CHECK-1024-NEXT:          Opcode:          I32_CONST
-CHECK-1024-NEXT:          Value:           65536
-CHECK-1024-NEXT:      - Index:           1
-CHECK-1024-NEXT:        Type:            I32
 CHECK-1024-NEXT:        Mutable:         false
 CHECK-1024-NEXT:        InitExpr:
 CHECK-1024-NEXT:          Opcode:          I32_CONST
 CHECK-1024-NEXT:          Value:           65536
-CHECK-1024-NEXT:      - Index:           2
+CHECK-1024-NEXT:      - Index:           1
 CHECK-1024-NEXT:        Type:            I32
 CHECK-1024-NEXT:        Mutable:         false
 CHECK-1024-NEXT:        InitExpr:
@@ -36,10 +30,10 @@ CHECK-1024-NEXT:          Value:           65536
 CHECK-1024:       - Type:            EXPORT
 CHECK-1024:           - Name:            __data_end
 CHECK-1024-NEXT:        Kind:            GLOBAL
-CHECK-1024-NEXT:        Index:           1
+CHECK-1024-NEXT:        Index:           0
 CHECK-1024-NEXT:      - Name:            __global_base
 CHECK-1024-NEXT:        Kind:            GLOBAL
-CHECK-1024-NEXT:        Index:           2
+CHECK-1024-NEXT:        Index:           1
 
 RUN: wasm-ld --export=__global_base --export=__data_end --allow-undefined --global-base=16777216 -o %t.wasm %t.o
 RUN: obj2yaml %t.wasm | FileCheck %s  -check-prefix=CHECK-16777216
@@ -47,17 +41,11 @@ CHECK-16777216:       - Type:            GLOBAL
 CHECK-16777216-NEXT:    Globals:
 CHECK-16777216-NEXT:      - Index:           0
 CHECK-16777216-NEXT:        Type:            I32
-CHECK-16777216-NEXT:        Mutable:         true
-CHECK-16777216-NEXT:        InitExpr:
-CHECK-16777216-NEXT:          Opcode:          I32_CONST
-CHECK-16777216-NEXT:          Value:           65536
-CHECK-16777216-NEXT:      - Index:           1
-CHECK-16777216-NEXT:        Type:            I32
 CHECK-16777216-NEXT:        Mutable:         false
 CHECK-16777216-NEXT:        InitExpr:
 CHECK-16777216-NEXT:          Opcode:          I32_CONST
 CHECK-16777216-NEXT:          Value:           16777216
-CHECK-16777216-NEXT:      - Index:           2
+CHECK-16777216-NEXT:      - Index:           1
 CHECK-16777216-NEXT:        Type:            I32
 CHECK-16777216-NEXT:        Mutable:         false
 CHECK-16777216-NEXT:        InitExpr:
@@ -67,7 +55,7 @@ CHECK-16777216-NEXT:          Value:           16777216
 CHECK-16777216:       - Type:            EXPORT
 CHECK-16777216:           - Name:            __data_end
 CHECK-16777216-NEXT:        Kind:            GLOBAL
-CHECK-16777216-NEXT:        Index:           1
+CHECK-16777216-NEXT:        Index:           0
 CHECK-16777216-NEXT:      - Name:            __global_base
 CHECK-16777216-NEXT:        Kind:            GLOBAL
-CHECK-16777216-NEXT:        Index:           2
+CHECK-16777216-NEXT:        Index:           1
diff --git a/lld/test/wasm/globals.s b/lld/test/wasm/globals.s
index 47d9ba82818b7..dbeebcc85584d 100644
--- a/lld/test/wasm/globals.s
+++ b/lld/test/wasm/globals.s
@@ -39,23 +39,17 @@ immutable_global:
 # CHECK-NEXT:    Globals:
 # CHECK-NEXT:      - Index:           0
 # CHECK-NEXT:        Type:            I32
-# CHECK-NEXT:        Mutable:         true
+# CHECK-NEXT:        Mutable:         false
 # CHECK-NEXT:        InitExpr:
 # CHECK-NEXT:          Opcode:          I32_CONST
-# CHECK-NEXT:          Value:           65536
-# 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:      - Index:           2
+# CHECK-NEXT:          Value:           0
+# CHECK-NEXT:      - Index:           1
 # CHECK-NEXT:        Type:            I32
 # CHECK-NEXT:        Mutable:         true
 # CHECK-NEXT:        InitExpr:
 # CHECK-NEXT:          Opcode:          I32_CONST
 # CHECK-NEXT:          Value:           0
-# CHECK-NEXT:      - Index:           3
+# CHECK-NEXT:      - Index:           2
 # CHECK-NEXT:        Type:            F32
 # CHECK-NEXT:        Mutable:         true
 # CHECK-NEXT:        InitExpr:
diff --git a/lld/test/wasm/lto/tls.ll b/lld/test/wasm/lto/tls.ll
index 9c1642eb84535..d2bc2979b7f78 100644
--- a/lld/test/wasm/lto/tls.ll
+++ b/lld/test/wasm/lto/tls.ll
@@ -27,12 +27,6 @@ attributes #0 = { noinline nounwind optnone "target-features"="+atomics,+bulk-me
 ; CHECK-NEXT:     Globals:
 ; CHECK-NEXT:       - Index:           0
 ; CHECK-NEXT:         Type:            I32
-; CHECK-NEXT:         Mutable:         true
-; CHECK-NEXT:         InitExpr:
-; CHECK-NEXT:           Opcode:          I32_CONST
-; CHECK-NEXT:           Value:           65536
-; CHECK-NEXT:       - Index:           1
-; CHECK-NEXT:         Type:            I32
 ; CHECK-NEXT:         Mutable:         false
 ; CHECK-NEXT:         InitExpr:
 ; CHECK-NEXT:           Opcode:          I32_CONST
@@ -40,6 +34,4 @@ attributes #0 = { noinline nounwind optnone "target-features"="+atomics,+bulk-me
 
 ;      CHECK:     GlobalNames:
 ; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __stack_pointer
-; CHECK-NEXT:       - Index:           1
 ; CHECK-NEXT:         Name:            __tls_base
diff --git a/lld/test/wasm/map-file.s b/lld/test/wasm/map-file.s
index 380ab57ca8ee4..ade851e73838d 100644
--- a/lld/test/wasm/map-file.s
+++ b/lld/test/wasm/map-file.s
@@ -47,27 +47,26 @@ somezeroes:
 # CHECK-NEXT:       -       16        6 FUNCTION
 # CHECK-NEXT:       -       1c        7 TABLE
 # CHECK-NEXT:       -       23        5 MEMORY
-# CHECK-NEXT:       -       28        f GLOBAL
-# CHECK-NEXT:       0        0        0         __stack_pointer
-# CHECK-NEXT:       1        0        0         wasm_global
-# CHECK-NEXT:       -       37       15 EXPORT
-# CHECK-NEXT:       -       4c        9 ELEM
-# CHECK-NEXT:       -       55       2d CODE
-# CHECK-NEXT:       -       56       10         {{.*}}{{/|\\}}map-file.s.tmp1.o:(bar)
-# CHECK-NEXT:       -       56       10                 bar
-# CHECK-NEXT:       -       66        b         {{.*}}{{/|\\}}map-file.s.tmp1.o:(write_global)
-# CHECK-NEXT:       -       66        b                 write_global
-# CHECK-NEXT:       -       71        f         {{.*}}{{/|\\}}map-file.s.tmp1.o:(_start)
-# CHECK-NEXT:       -       71        f                 _start
-# CHECK-NEXT:       -       82       12 DATA
-# CHECK-NEXT:   10000       83        8 .data
-# CHECK-NEXT:   10000       8a        8         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.data.somedata)
-# CHECK-NEXT:   10000       8a        8                 somedata
-# CHECK-NEXT:   10008       82        4 .bss
+# CHECK-NEXT:       -       28        8 GLOBAL
+# CHECK-NEXT:       0        0        0         wasm_global
+# CHECK-NEXT:       -       30       15 EXPORT
+# CHECK-NEXT:       -       45        9 ELEM
+# CHECK-NEXT:       -       4e       2d CODE
+# CHECK-NEXT:       -       4f       10         {{.*}}{{/|\\}}map-file.s.tmp1.o:(bar)
+# CHECK-NEXT:       -       4f       10                 bar
+# CHECK-NEXT:       -       5f        b         {{.*}}{{/|\\}}map-file.s.tmp1.o:(write_global)
+# CHECK-NEXT:       -       5f        b                 write_global
+# CHECK-NEXT:       -       6a        f         {{.*}}{{/|\\}}map-file.s.tmp1.o:(_start)
+# CHECK-NEXT:       -       6a        f                 _start
+# CHECK-NEXT:       -       7b       12 DATA
+# CHECK-NEXT:   10000       7c        8 .data
+# CHECK-NEXT:   10000       83        8         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.data.somedata)
+# CHECK-NEXT:   10000       83        8                 somedata
+# CHECK-NEXT:   10008       7b        4 .bss
 # CHECK-NEXT:   10008        0        4         {{.*}}{{/|\\}}map-file.s.tmp1.o:(.bss.somezeroes)
 # CHECK-NEXT:   10008        0        4                 somezeroes
-# CHECK-NEXT:       -       94       12 CUSTOM(.debug_info)
-# CHECK-NEXT:       -       a6       61 CUSTOM(name)
+# CHECK-NEXT:       -       8d       12 CUSTOM(.debug_info)
+# CHECK-NEXT:       -       9f       50 CUSTOM(name)
 
 # RUN: not wasm-ld %t1.o -o /dev/null -Map=/ 2>&1 \
 # RUN:  | FileCheck -check-prefix=FAIL %s
diff --git a/lld/test/wasm/merge-string-debug.s b/lld/test/wasm/merge-string-debug.s
index 0075a834e0647..adf40205a6592 100644
--- a/lld/test/wasm/merge-string-debug.s
+++ b/lld/test/wasm/merge-string-debug.s
@@ -29,13 +29,13 @@
 
 # CHECK: Hex dump of section '.debug_str':
 
-# CHECK-O0: 0x00000025 636c616e 67207665 7273696f 6e203133 clang version 13
-# CHECK-O0: 0x00000035 2e302e30 00666f6f 62617200 636c616e .0.0.foobar.clan
-# CHECK-O0: 0x00000045 67207665 7273696f 6e203133 2e302e30 g version 13.0.0
-# CHECK-O0: 0x00000055 00626172 00666f6f 00                .bar.foo.
+# CHECK-O0: 0x0000001b 636c616e 67207665 7273696f 6e203133 clang version 13
+# CHECK-O0: 0x0000002b 2e302e30 00666f6f 62617200 636c616e .0.0.foobar.clan
+# CHECK-O0: 0x0000003b 67207665 7273696f 6e203133 2e302e30 g version 13.0.0
+# CHECK-O0: 0x0000004b 00626172 00666f6f 00                .bar.foo.
 
-# CHECK-O1: 0x00000025 666f6f62 61720066 6f6f0063 6c616e67 foobar.foo.clang
-# CHECK-O1: 0x00000035 20766572 73696f6e 2031332e 302e3000  version 13.0.0.
+# CHECK-O1: 0x0000001b 666f6f62 61720066 6f6f0063 6c616e67 foobar.foo.clang
+# CHECK-O1: 0x0000002b 20766572 73696f6e 2031332e 302e3000  version 13.0.0.
 
 # CHECK-OFFSETS: Hex dump of section '.debug_str_offsets':
-# CHECK-OFFSETS: 0x0000007e 00000000 00000000 00000000          ............
+# CHECK-OFFSETS: 0x00000074 00000000 00000000 00000000          ............
diff --git a/lld/test/wasm/mutable-global-exports.s b/lld/test/wasm/mutable-global-exports.s
index 3cf1ae746b30a..76541aaf986ef 100644
--- a/lld/test/wasm/mutable-global-exports.s
+++ b/lld/test/wasm/mutable-global-exports.s
@@ -49,7 +49,7 @@ _start:
 # CHECK-NEXT:        Index:           0
 # CHECK-NEXT:      - Name:            foo_global
 # CHECK-NEXT:        Kind:            GLOBAL
-# CHECK-NEXT:        Index:           1
+# CHECK-NEXT:        Index:           0
 # CHECK-NEXT:  - Type:            CODE
 
 #      CHECK-SP:  - Type:            EXPORT
diff --git a/lld/test/wasm/name-section-mangling.s b/lld/test/wasm/name-section-mangling.s
index a24fbc747d76e..6b2982d0ad658 100644
--- a/lld/test/wasm/name-section-mangling.s
+++ b/lld/test/wasm/name-section-mangling.s
@@ -58,7 +58,4 @@ _start:
 # CHECK-NEXT:       - Index:           2
 # DEMANGLE-NEXT:      Name:            'foo(int)'
 # MANGLE-NEXT:        Name:            _Z3fooi
-# CHECK-NEXT:     GlobalNames:
-# CHECK-NEXT:       - Index:           0
-# CHECK-NEXT:         Name:            __stack_pointer
 # CHECK-NEXT: ...
diff --git a/lld/test/wasm/signature-mismatch-export.ll b/lld/test/wasm/signature-mismatch-export.ll
index b77b5092a092a..997449bfdbeb9 100644
--- a/lld/test/wasm/signature-mismatch-export.ll
+++ b/lld/test/wasm/signature-mismatch-export.ll
@@ -27,7 +27,4 @@ entry:
 ; CHECK-NEXT:         Name:            _start
 ; CHECK-NEXT:       - Index:           2
 ; CHECK-NEXT:         Name:            ret32
-; CHECK-NEXT:     GlobalNames:
-; CHECK-NEXT:       - Index:           0
-; CHECK-NEXT:         Name:            __stack_pointer
 ; CHECK-NEXT: ...
diff --git a/lld/test/wasm/signature-mismatch.s b/lld/test/wasm/signature-mismatch.s
index 89915dbdb30ce..9c9e81c29fa66 100644
--- a/lld/test/wasm/signature-mismatch.s
+++ b/lld/test/wasm/signature-mismatch.s
@@ -74,9 +74,6 @@ ret32_address_main:
 # YAML-NEXT:         Name:            ret32
 # YAML-NEXT:       - Index:           3
 # YAML-NEXT:         Name:            call_ret32
-# YAML-NEXT:     GlobalNames:
-# YAML-NEXT:       - Index:           0
-# YAML-NEXT:         Name:            __stack_pointer
 # YAML-NEXT:     DataSegmentNames:
 # YAML-NEXT:       - Index:           0
 # YAML-NEXT:         Name:            .data
diff --git a/lld/test/wasm/stack-first.test b/lld/test/wasm/stack-first.test
index 91f06a47070a0..5cfd11ee9d965 100644
--- a/lld/test/wasm/stack-first.test
+++ b/lld/test/wasm/stack-first.test
@@ -23,23 +23,17 @@ CHECK:        - Type:            GLOBAL
 CHECK-NEXT:     Globals:         
 CHECK-NEXT:       - Index:           0
 CHECK-NEXT:         Type:            I32
-CHECK-NEXT:         Mutable:         true
-CHECK-NEXT:         InitExpr:        
-CHECK-NEXT:           Opcode:          I32_CONST
-CHECK-NEXT:           Value:           512
-CHECK-NEXT:       - Index:           1
-CHECK-NEXT:         Type:            I32
 CHECK-NEXT:         Mutable:         false
 CHECK-NEXT:         InitExpr:        
 CHECK-NEXT:           Opcode:          I32_CONST
 CHECK-NEXT:           Value:           512
-CHECK-NEXT:       - Index:           2
+CHECK-NEXT:       - Index:           1
 CHECK-NEXT:         Type:            I32
 CHECK-NEXT:         Mutable:         false
 CHECK-NEXT:         InitExpr:        
 CHECK-NEXT:           Opcode:          I32_CONST
 CHECK-NEXT:           Value:     ...
[truncated]

dschuff · 2026-05-26T22:48:07Z

Nice that this is only one line. Have you run it through the emscripten test suite yet?

sbc100 · 2026-05-26T23:01:02Z

Nice that this is only one line. Have you run it through the emscripten test suite yet?

Yes, I ran all of other and core0

sbc100 · 2026-05-26T23:24:15Z

Nice that this is only one line. Have you run it through the emscripten test suite yet?

Yes, I ran all of other and core0

core2 also passes, so I think we are good from an emscripten POV.

I think it helps that I recently fixed binaryen to be more tolerant of missing stack pointer: WebAssembly/binaryen#8679

sbc100 requested a review from dschuff May 26, 2026 18:25

llvmorg-github-actions Bot added lld lld:wasm labels May 26, 2026

[lld][WebAssembly] Only include __stack_pointer when needed

4104c3b

sbc100 force-pushed the stack_pointers_optional branch from 6ef3f1d to 4104c3b Compare May 26, 2026 23:22

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[lld][WebAssembly] Only include __stack_pointer when needed#199739

[lld][WebAssembly] Only include __stack_pointer when needed#199739
sbc100 wants to merge 1 commit into
llvm:mainfrom
sbc100:stack_pointers_optional

sbc100 commented May 26, 2026

Uh oh!

llvmorg-github-actions Bot commented May 26, 2026 •

edited

Loading

Uh oh!

dschuff commented May 26, 2026

Uh oh!

sbc100 commented May 26, 2026

Uh oh!

sbc100 commented May 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

Conversation

sbc100 commented May 26, 2026

Uh oh!

llvmorg-github-actions Bot commented May 26, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

dschuff commented May 26, 2026

Uh oh!

sbc100 commented May 26, 2026

Uh oh!

sbc100 commented May 26, 2026

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

llvmorg-github-actions Bot commented May 26, 2026 •

edited

Loading