Skip to content

[Strings] Represent string values as WTF-16 internally #6418

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
tlively merged 10 commits into from
Mar 22, 2024
Merged

[Strings] Represent string values as WTF-16 internally #6418

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3515469
[Strings] Represent string values as WTF-16 internally
tlively Mar 21, 2024
f2baea4
convert to WTF-16 in C API
tlively Mar 21, 2024
7df7e33
restore most escapes in test
tlively Mar 21, 2024
c3bfb29
comment on surrogate concatenation
tlively Mar 21, 2024
cd41dfd
comment in makeConstantExpression
tlively Mar 21, 2024
8db8221
use wtf-16 in the fuzzer
tlively Mar 22, 2024
73a66e1
print string literals with WTF-8
tlively Mar 22, 2024
781efcc
do not confuse split_wast with fake escape
tlively Mar 22, 2024
68de7bb
allow strings in fuzzer initial contents
tlively Mar 22, 2024
eba0bb8
remove dead code
tlively Mar 22, 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
print string literals with WTF-8
  • Loading branch information
@tlively
tlively committed Mar 22, 2024
commit 73a66e1c84861df504687ab63c911863fa3d0c4e
14 changes: 12 additions & 2 deletions src/wasm/literal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
#include "ir/bits.h"
#include "pretty_printing.h"
#include "support/bits.h"
#include "support/string.h"
#include "support/utilities.h"

namespace wasm {
Expand Down Expand Up @@ -639,10 +640,19 @@ std::ostream& operator<<(std::ostream& o, Literal literal) {
o << "nullstring";
} else {
o << "string(\"";
// Convert WTF-16 literals to WTF-16 string.
std::stringstream wtf16;
for (auto c : data->values) {
// TODO: more than ascii
o << char(c.getInteger());
auto u = c.getInteger();
assert(u < 0x10000);
wtf16 << uint8_t(u & 0xFF);
wtf16 << uint8_t(u >> 8);
}
// Convert to WTF-8 for printing.
// TODO: Use wtf16.view() once we have C++20.
[[maybe_unused]] bool valid =
String::convertWTF16ToWTF8(o, wtf16.str());
assert(valid);
o << "\")";
}
break;
Expand Down