summaryrefslogtreecommitdiff
path: root/src/tools
diff options
context:
space:
mode:
Diffstat (limited to 'src/tools')
-rw-r--r--src/tools/fuzzing.h14
-rw-r--r--src/tools/wasm-reduce.cpp2
-rw-r--r--src/tools/wasm2c-wrapper.h2
3 files changed, 9 insertions, 9 deletions
diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h
index 23ea6bbec..b3c1212d4 100644
--- a/src/tools/fuzzing.h
+++ b/src/tools/fuzzing.h
@@ -306,7 +306,7 @@ private:
double getDouble() { return Literal(get64()).reinterpretf64(); }
Type getSubType(Type type) {
- if (type.isMulti()) {
+ if (type.isTuple()) {
std::vector<Type> types;
for (const auto& t : type) {
types.push_back(getSubType(t));
@@ -850,7 +850,7 @@ private:
Expression* _makeConcrete(Type type) {
bool canMakeControlFlow =
- !type.isMulti() || wasm.features.has(FeatureSet::Multivalue);
+ !type.isTuple() || wasm.features.has(FeatureSet::Multivalue);
using Self = TranslateToFuzzReader;
FeatureOptions<Expression* (Self::*)(Type)> options;
using WeightedOption = decltype(options)::WeightedOption;
@@ -886,7 +886,7 @@ private:
if (type == Type::i32) {
options.add(FeatureSet::ReferenceTypes, &Self::makeRefIsNull);
}
- if (type.isMulti()) {
+ if (type.isTuple()) {
options.add(FeatureSet::Multivalue, &Self::makeTupleMake);
}
return (this->*pick(options))(type);
@@ -1265,7 +1265,7 @@ private:
Expression* makeTupleMake(Type type) {
assert(wasm.features.hasMultivalue());
- assert(type.isMulti());
+ assert(type.isTuple());
std::vector<Expression*> elements;
for (const auto& t : type) {
elements.push_back(make(t));
@@ -1765,7 +1765,7 @@ private:
}
return builder.makeRefNull();
}
- if (type.isMulti()) {
+ if (type.isTuple()) {
std::vector<Expression*> operands;
for (const auto& t : type) {
operands.push_back(makeConst(t));
@@ -1783,7 +1783,7 @@ private:
}
Expression* makeUnary(Type type) {
- assert(!type.isMulti());
+ assert(!type.isTuple());
if (type == Type::unreachable) {
if (auto* unary = makeUnary(getSingleConcreteType())->dynCast<Unary>()) {
return builder.makeUnary(unary->op, make(Type::unreachable));
@@ -2004,7 +2004,7 @@ private:
}
Expression* makeBinary(Type type) {
- assert(!type.isMulti());
+ assert(!type.isTuple());
if (type == Type::unreachable) {
if (auto* binary =
makeBinary(getSingleConcreteType())->dynCast<Binary>()) {
diff --git a/src/tools/wasm-reduce.cpp b/src/tools/wasm-reduce.cpp
index e0491c0db..9c9978b63 100644
--- a/src/tools/wasm-reduce.cpp
+++ b/src/tools/wasm-reduce.cpp
@@ -1019,7 +1019,7 @@ struct Reducer
RefNull* n = builder->makeRefNull();
return tryToReplaceCurrent(n);
}
- if (curr->type.isMulti()) {
+ if (curr->type.isTuple()) {
Expression* n =
builder->makeConstantExpression(Literal::makeZero(curr->type));
return tryToReplaceCurrent(n);
diff --git a/src/tools/wasm2c-wrapper.h b/src/tools/wasm2c-wrapper.h
index 91971c68b..6ea473d7a 100644
--- a/src/tools/wasm2c-wrapper.h
+++ b/src/tools/wasm2c-wrapper.h
@@ -164,7 +164,7 @@ int main(int argc, char** argv) {
};
ret += wasm2cSignature(result);
- if (func->sig.params.isMulti()) {
+ if (func->sig.params.isTuple()) {
for (const auto& param : func->sig.params) {
ret += wasm2cSignature(param);
}