Skip to content

[Strings] Avoid mishandling unicode in StringConcat. #6411

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
Mar 19, 2024
Merged

[Strings] Avoid mishandling unicode in StringConcat. #6411

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
7d278f9
[Strings] Avoid mishandling unicode in StringConcat.
rluble Mar 19, 2024
9a7f688
Use the helper instead of explicilty checking in the existing loop.
rluble Mar 19, 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
5 changes: 5 additions & 0 deletions src/wasm-interpreter.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1959,6 +1959,11 @@ class ExpressionRunner : public OverriddenVisitor<SubType, Flow> {
if (!leftData || !rightData) {
trap("null ref");
}
// This is only correct if all the bytes in the left operand correspond
// to single unicode code points.
if (hasNonAsciiUpTo(leftData->values)) {
return Flow(NONCONSTANT_FLOW);
}

Literals contents;
contents.reserve(leftData->values.size() + rightData->values.size());
Expand Down
28 changes: 27 additions & 1 deletion test/lit/passes/precompute-strings.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,21 @@
;; NOTE: Assertions have been generated by update_lit_checks.py and should not be edited.
;; NOTE: Assertions have been generated by update_lit_checks.py --all-items and should not be edited.

;; RUN: wasm-opt %s --precompute -all -S -o - | filecheck %s

(module
;; CHECK: (type $0 (func (result i32)))

;; CHECK: (type $1 (func (result (ref string))))

;; CHECK: (type $array16 (array (mut i16)))
(type $array16 (array (mut i16)))

;; CHECK: (export "get_codepoint-bad" (func $get_codepoint-bad))

;; CHECK: (export "slice" (func $slice))

;; CHECK: (export "slice-bad" (func $slice-bad))

;; CHECK: (func $eq-no (type $0) (result i32)
;; CHECK-NEXT: (i32.const 0)
;; CHECK-NEXT: )
Expand Down Expand Up @@ -36,6 +46,22 @@
)
)

;; CHECK: (func $concat-bad (type $0) (result i32)
;; CHECK-NEXT: (string.eq
;; CHECK-NEXT: (string.concat
;; CHECK-NEXT: (string.const "a\f0")
;; CHECK-NEXT: (string.const "b")
;; CHECK-NEXT: )
;; CHECK-NEXT: (string.const "a\f0b")
;; CHECK-NEXT: )
;; CHECK-NEXT: )
(func $concat-bad (result i32)
(string.eq
(string.concat (string.const "a\F0") (string.const "b"))
(string.const "a\F0b")
)
)

;; CHECK: (func $length (type $0) (result i32)
;; CHECK-NEXT: (i32.const 7)
;; CHECK-NEXT: )
Expand Down