summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlon Zakai <azakai@google.com>2024-02-14 10:30:10 -0800
committerGitHub <noreply@github.com>2024-02-14 10:30:10 -0800
commit5ef1aba98ebff75e29b2c90d8b683b1f0fe1f123 (patch)
treecb1bbc59fb947132b2da46c2a72101e7fc4ce9a8
parentdf3784e3df9744d943016b110e1f92af286cec72 (diff)
downloadbinaryen-5ef1aba98ebff75e29b2c90d8b683b1f0fe1f123.tar.gz
binaryen-5ef1aba98ebff75e29b2c90d8b683b1f0fe1f123.tar.bz2
binaryen-5ef1aba98ebff75e29b2c90d8b683b1f0fe1f123.zip
Strings: Add some interpreter support (#6304)
This adds just enough support to be able to --fuzz-exec a small but realistic fuzz testcase from Java. To that end, just implement the minimal ops we need, which are all related to JS-style strings.
-rw-r--r--src/wasm-interpreter.h58
-rw-r--r--src/wasm/wasm-type.cpp3
-rw-r--r--test/lit/exec/strings.wast31
3 files changed, 88 insertions, 4 deletions
diff --git a/src/wasm-interpreter.h b/src/wasm-interpreter.h
index 1d9c576bc..b65b909c7 100644
--- a/src/wasm-interpreter.h
+++ b/src/wasm-interpreter.h
@@ -1902,7 +1902,21 @@ public:
Flow visitStringConst(StringConst* curr) {
return Literal(curr->string.toString());
}
- Flow visitStringMeasure(StringMeasure* curr) { WASM_UNREACHABLE("unimp"); }
+ Flow visitStringMeasure(StringMeasure* curr) {
+ // For now we only support JS-style strings.
+ assert(curr->op == StringMeasureWTF16View);
+
+ Flow flow = visit(curr->ref);
+ if (flow.breaking()) {
+ return flow;
+ }
+ auto value = flow.getSingleValue();
+ auto data = value.getGCData();
+ if (!data) {
+ trap("null ref");
+ }
+ return Literal(int32_t(data->values.size()));
+ }
Flow visitStringEncode(StringEncode* curr) { WASM_UNREACHABLE("unimp"); }
Flow visitStringConcat(StringConcat* curr) { WASM_UNREACHABLE("unimp"); }
Flow visitStringEq(StringEq* curr) {
@@ -1971,11 +1985,49 @@ public:
}
return Literal(result);
}
- Flow visitStringAs(StringAs* curr) { WASM_UNREACHABLE("unimp"); }
+ Flow visitStringAs(StringAs* curr) {
+ // For now we only support JS-style strings.
+ assert(curr->op == StringAsWTF16);
+
+ Flow flow = visit(curr->ref);
+ if (flow.breaking()) {
+ return flow;
+ }
+ auto value = flow.getSingleValue();
+ auto data = value.getGCData();
+ if (!data) {
+ trap("null ref");
+ }
+
+ // A JS-style string can be viewed simply as the underlying data. All we
+ // need to do is fix up the type.
+ return Literal(data, curr->type.getHeapType());
+ }
Flow visitStringWTF8Advance(StringWTF8Advance* curr) {
WASM_UNREACHABLE("unimp");
}
- Flow visitStringWTF16Get(StringWTF16Get* curr) { WASM_UNREACHABLE("unimp"); }
+ Flow visitStringWTF16Get(StringWTF16Get* curr) {
+ NOTE_ENTER("StringEq");
+ Flow ref = visit(curr->ref);
+ if (ref.breaking()) {
+ return ref;
+ }
+ Flow pos = visit(curr->pos);
+ if (pos.breaking()) {
+ return pos;
+ }
+ auto refValue = ref.getSingleValue();
+ auto data = refValue.getGCData();
+ if (!data) {
+ trap("null ref");
+ }
+ auto& values = data->values;
+ Index i = pos.getSingleValue().geti32();
+ if (i >= values.size()) {
+ trap("string oob");
+ }
+ return Literal(values[i].geti32());
+ }
Flow visitStringIterNext(StringIterNext* curr) { WASM_UNREACHABLE("unimp"); }
Flow visitStringIterMove(StringIterMove* curr) { WASM_UNREACHABLE("unimp"); }
Flow visitStringSliceWTF(StringSliceWTF* curr) { WASM_UNREACHABLE("unimp"); }
diff --git a/src/wasm/wasm-type.cpp b/src/wasm/wasm-type.cpp
index 31042835c..b14e5aa39 100644
--- a/src/wasm/wasm-type.cpp
+++ b/src/wasm/wasm-type.cpp
@@ -1163,7 +1163,8 @@ bool HeapType::isFunction() const {
bool HeapType::isData() const {
if (isBasic()) {
- return id == struct_ || id == array || id == string;
+ return id == struct_ || id == array || id == string ||
+ id == stringview_wtf16;
} else {
return getHeapTypeInfo(*this)->isData();
}
diff --git a/test/lit/exec/strings.wast b/test/lit/exec/strings.wast
index e7e31392a..711d2e36a 100644
--- a/test/lit/exec/strings.wast
+++ b/test/lit/exec/strings.wast
@@ -162,6 +162,29 @@
(string.const "hf")
)
)
+
+ ;; CHECK: [fuzz-exec] calling get_codeunit
+ ;; CHECK-NEXT: [fuzz-exec] note result: get_codeunit => 99
+ (func $get_codeunit (export "get_codeunit") (result i32)
+ ;; Reads 'c' which is code 99.
+ (stringview_wtf16.get_codeunit
+ (string.as_wtf16
+ (string.const "abcdefg")
+ )
+ (i32.const 2)
+ )
+ )
+
+ ;; CHECK: [fuzz-exec] calling get_length
+ ;; CHECK-NEXT: [fuzz-exec] note result: get_length => 7
+ (func $get_length (export "get_length") (result i32)
+ ;; This should return 7.
+ (stringview_wtf16.length
+ (string.as_wtf16
+ (string.const "1234567")
+ )
+ )
+ )
)
;; CHECK: [fuzz-exec] calling new_wtf16_array
;; CHECK-NEXT: [fuzz-exec] note result: new_wtf16_array => string("ello")
@@ -213,6 +236,12 @@
;; CHECK: [fuzz-exec] calling compare.10
;; CHECK-NEXT: [fuzz-exec] note result: compare.10 => -1
+
+;; CHECK: [fuzz-exec] calling get_codeunit
+;; CHECK-NEXT: [fuzz-exec] note result: get_codeunit => 99
+
+;; CHECK: [fuzz-exec] calling get_length
+;; CHECK-NEXT: [fuzz-exec] note result: get_length => 7
;; CHECK-NEXT: [fuzz-exec] comparing compare.1
;; CHECK-NEXT: [fuzz-exec] comparing compare.10
;; CHECK-NEXT: [fuzz-exec] comparing compare.2
@@ -229,4 +258,6 @@
;; CHECK-NEXT: [fuzz-exec] comparing eq.3
;; CHECK-NEXT: [fuzz-exec] comparing eq.4
;; CHECK-NEXT: [fuzz-exec] comparing eq.5
+;; CHECK-NEXT: [fuzz-exec] comparing get_codeunit
+;; CHECK-NEXT: [fuzz-exec] comparing get_length
;; CHECK-NEXT: [fuzz-exec] comparing new_wtf16_array