Skip to content

[Strings] Do not reuse mutable globals in StringGathering #6531

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
kripken merged 2 commits into from
Apr 24, 2024
Merged

[Strings] Do not reuse mutable globals in StringGathering #6531

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b83f87
test
kripken Apr 24, 2024
d9e211d
fix
kripken Apr 24, 2024
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
3 changes: 2 additions & 1 deletion src/passes/StringLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,8 @@ struct StringGathering : public Pass {

// Find globals to reuse (see comment on stringPtrsToPreserve for context).
for (auto& global : module->globals) {
if (global->type == nnstringref && !global->imported()) {
if (global->type == nnstringref && !global->imported() &&
!global->mutable_) {
if (auto* stringConst = global->init->dynCast<StringConst>()) {
auto& globalName = stringToGlobalName[stringConst->string];
if (!globalName.is()) {
Expand Down
67 changes: 67 additions & 0 deletions test/lit/passes/string-gathering.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,3 +212,70 @@
;; LOWER: (global $global6 (ref extern) (global.get $global4))
(global $global6 (ref string) (string.const "bar"))
)

;; Mutable globals cannot be reused: we will create a new global for "foo".
(module
;; CHECK: (type $0 (func))

;; CHECK: (global $string.const_foo (ref string) (string.const "foo"))

;; CHECK: (global $global (mut (ref string)) (global.get $string.const_foo))
;; LOWER: (type $0 (func (param externref externref) (result i32)))

;; LOWER: (type $1 (array (mut i16)))

;; LOWER: (type $2 (func))

;; LOWER: (type $3 (func (param (ref null $1) i32 i32) (result (ref extern))))

;; LOWER: (type $4 (func (param i32) (result (ref extern))))

;; LOWER: (type $5 (func (param externref externref) (result (ref extern))))

;; LOWER: (type $6 (func (param externref (ref null $1) i32) (result i32)))

;; LOWER: (type $7 (func (param externref) (result i32)))

;; LOWER: (type $8 (func (param externref i32) (result i32)))

;; LOWER: (type $9 (func (param externref i32 i32) (result (ref extern))))

;; LOWER: (import "string.const" "0" (global $string.const_foo (ref extern)))

;; LOWER: (import "wasm:js-string" "fromCharCodeArray" (func $fromCharCodeArray (type $3) (param (ref null $1) i32 i32) (result (ref extern))))

;; LOWER: (import "wasm:js-string" "fromCodePoint" (func $fromCodePoint (type $4) (param i32) (result (ref extern))))

;; LOWER: (import "wasm:js-string" "concat" (func $concat (type $5) (param externref externref) (result (ref extern))))

;; LOWER: (import "wasm:js-string" "intoCharCodeArray" (func $intoCharCodeArray (type $6) (param externref (ref null $1) i32) (result i32)))

;; LOWER: (import "wasm:js-string" "equals" (func $equals (type $0) (param externref externref) (result i32)))

;; LOWER: (import "wasm:js-string" "compare" (func $compare (type $0) (param externref externref) (result i32)))

;; LOWER: (import "wasm:js-string" "length" (func $length (type $7) (param externref) (result i32)))

;; LOWER: (import "wasm:js-string" "charCodeAt" (func $charCodeAt (type $8) (param externref i32) (result i32)))

;; LOWER: (import "wasm:js-string" "substring" (func $substring (type $9) (param externref i32 i32) (result (ref extern))))

;; LOWER: (global $global (mut (ref extern)) (global.get $string.const_foo))
(global $global (mut (ref string)) (string.const "foo"))

;; CHECK: (func $a (type $0)
;; CHECK-NEXT: (drop
;; CHECK-NEXT: (global.get $string.const_foo)
;; CHECK-NEXT: )
;; CHECK-NEXT: )
;; LOWER: (func $a (type $2)
;; LOWER-NEXT: (drop
;; LOWER-NEXT: (global.get $string.const_foo)
;; LOWER-NEXT: )
;; LOWER-NEXT: )
(func $a
(drop
(string.const "foo")
)
)
)