Skip to content

StringLowering: Escape the JSON in the custom section #6316

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 14 commits into from
Feb 20, 2024
Merged

StringLowering: Escape the JSON in the custom section #6316

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
2851c52
start
kripken Feb 15, 2024
5e80819
fix
kripken Feb 15, 2024
fc3f9e4
Use json escapes (dash-u)
kripken Feb 16, 2024
b727091
change API as suggested
kripken Feb 16, 2024
2ffe9ab
format
kripken Feb 16, 2024
24b01e1
fun with code points
kripken Feb 16, 2024
2ebdec6
work
kripken Feb 16, 2024
9558204
test
kripken Feb 16, 2024
827a4df
fix
kripken Feb 16, 2024
b95c38c
format
kripken Feb 16, 2024
332fb61
Add warning and test coverage
kripken Feb 20, 2024
5b4c654
comments
kripken Feb 20, 2024
f0158a6
fix 16/32 encoding and add a passing test for a weird utf8 char
kripken Feb 20, 2024
1d7b783
fix node.js nondeterminism across versions
kripken Feb 20, 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
Prev Previous commit
Next Next commit
Add warning and test coverage
  • Loading branch information
@kripken
kripken committed Feb 20, 2024
commit 332fb6176d5abc391451692eea0404fd013238ec
3 changes: 3 additions & 0 deletions src/support/string.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,9 @@ std::ostream& printEscapedJSON(std::ostream& os, const std::string_view str) {
if ((u0 & 0xF0) == 0xE0) {
u0 = ((u0 & 15) << 12) | (u1 << 6) | u2;
} else {
if ((u0 & 0xF8) != 0xF0) {
std::cerr << "warning: Bad UTF-8 leading byte " << int(u0) << '\n';
}
Comment on lines +208 to +210
Copy link
Member

@tlively tlively Feb 20, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It would be good to emit similar warnings in the 1-, 2-, and 3-byte cases as well

i++;
u0 = ((u0 & 7) << 18) | (u1 << 12) | (u2 << 6) | (str[i] & 63);
}
Expand Down
8 changes: 4 additions & 4 deletions test/lit/passes/string-lowering.wast
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
(string.const "foo")
)
(drop
(string.const "needs\tescaping\00.")
(string.const "needs\tescaping\00.'#%\"- .\r\n\\.")
)
)
)
Expand All @@ -24,7 +24,7 @@
;;
;; RUN: wasm-opt %s --string-lowering -all -S -o - | filecheck %s
;;
;; CHECK: custom section "string.consts", size 38, contents: "[\"bar\",\"foo\",\"needs\\tescaping\\u0000.\"]"
;; CHECK: custom section "string.consts", size 53, contents: "[\"bar\",\"foo\",\"needs\\tescaping\\u0000.'#%\\\"- .\\r\\n\\\\.\"]"

;; The custom section should parse OK using JSON.parse from node.
;; (Note we run --remove-unused-module-elements to remove externref-using
Expand All @@ -33,6 +33,6 @@
;; RUN: wasm-opt %s --string-lowering --remove-unused-module-elements -all -o %t.wasm
;; RUN: node %S/string-lowering.js %t.wasm | filecheck %s --check-prefix=CHECK-JS
;;
;; CHECK-JS: string: ["bar","foo","needs\tescaping\u0000."]
;; CHECK-JS: JSON: [ 'bar', 'foo', 'needs\tescaping\u0000.' ]
;; CHECK-JS: string: ["bar","foo","needs\tescaping\u0000.'#%\"- .\r\n\\."]
;; CHECK-JS: JSON: [ 'bar', 'foo', `needs\tescaping\u0000.'#%"- .\r\n\\.` ]