Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbc100 merged 1 commit into from
May 27, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions lld/test/wasm/alias.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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: ...
12 changes: 6 additions & 6 deletions lld/test/wasm/build-id.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
3 changes: 0 additions & 3 deletions lld/test/wasm/ctor-return-value.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ...
2 changes: 0 additions & 2 deletions lld/test/wasm/duplicate-global-imports.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion lld/test/wasm/export-optional.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
6 changes: 0 additions & 6 deletions lld/test/wasm/externref.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
3 changes: 0 additions & 3 deletions lld/test/wasm/function-imports-first.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ...
3 changes: 0 additions & 3 deletions lld/test/wasm/function-imports.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ...
2 changes: 0 additions & 2 deletions lld/test/wasm/gc-imports.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
10 changes: 1 addition & 9 deletions lld/test/wasm/gc-sections.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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
Expand Down
24 changes: 6 additions & 18 deletions lld/test/wasm/global-base.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -36,28 +30,22 @@ 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
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:
Expand All @@ -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
14 changes: 4 additions & 10 deletions lld/test/wasm/globals.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
8 changes: 0 additions & 8 deletions lld/test/wasm/lto/tls.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,11 @@ 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
; CHECK-NEXT: Value: 65536

; CHECK: GlobalNames:
; CHECK-NEXT: - Index: 0
; CHECK-NEXT: Name: __stack_pointer
; CHECK-NEXT: - Index: 1
; CHECK-NEXT: Name: __tls_base
37 changes: 18 additions & 19 deletions lld/test/wasm/map-file.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
14 changes: 7 additions & 7 deletions lld/test/wasm/merge-string-debug.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ............
2 changes: 1 addition & 1 deletion lld/test/wasm/mutable-global-exports.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 0 additions & 3 deletions lld/test/wasm/name-section-mangling.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ...
3 changes: 0 additions & 3 deletions lld/test/wasm/signature-mismatch-export.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: ...
3 changes: 0 additions & 3 deletions lld/test/wasm/signature-mismatch.s
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 5 additions & 17 deletions lld/test/wasm/stack-first.test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: 513
CHECK-NEXT: - Index: 3
CHECK-NEXT: - Index: 2
CHECK-NEXT: Type: I32
CHECK-NEXT: Mutable: false
CHECK-NEXT: InitExpr:
Expand All @@ -55,24 +49,18 @@ CHECK-NEXT: Kind: FUNCTION
CHECK-NEXT: Index: 0
CHECK-NEXT: - Name: someByte
CHECK-NEXT: Kind: GLOBAL
CHECK-NEXT: Index: 1
CHECK-NEXT: Index: 0
CHECK-NEXT: - Name: __data_end
CHECK-NEXT: Kind: GLOBAL
CHECK-NEXT: Index: 2
CHECK-NEXT: Index: 1
CHECK-NEXT: - Name: __heap_base
CHECK-NEXT: Kind: GLOBAL
CHECK-NEXT: Index: 3
CHECK-NEXT: Index: 2

NOT-FIRST: - Type: GLOBAL
NOT-FIRST-NEXT: Globals:
NOT-FIRST-NEXT: - Index: 0
NOT-FIRST-NEXT: Type: I32
NOT-FIRST-NEXT: Mutable: true
NOT-FIRST-NEXT: InitExpr:
NOT-FIRST-NEXT: Opcode: I32_CONST
NOT-FIRST-NEXT: Value: 1552
NOT-FIRST-NEXT: - Index: 1
NOT-FIRST-NEXT: Type: I32
NOT-FIRST-NEXT: Mutable: false
NOT-FIRST-NEXT: InitExpr:
NOT-FIRST-NEXT: Opcode: I32_CONST
Expand Down
Loading