diff options
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/fuzzing.h | 31 | ||||
| -rw-r--r-- | src/tools/spec-wrapper.h | 2 | ||||
| -rw-r--r-- | src/tools/wasm-reduce.cpp | 10 |
3 files changed, 22 insertions, 21 deletions
diff --git a/src/tools/fuzzing.h b/src/tools/fuzzing.h index 9788d9f11..63f4b5a85 100644 --- a/src/tools/fuzzing.h +++ b/src/tools/fuzzing.h @@ -316,7 +316,7 @@ private: SmallVector<Type, 2> options; options.push_back(type); // includes itself switch (type.getSingle()) { - case Type::anyref: + case Type::externref: if (wasm.features.hasExceptionHandling()) { options.push_back(Type::exnref); } @@ -1364,7 +1364,7 @@ private: 16, false, offset, pick(1, 2, 4, 8, 16), ptr, type); } case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -1468,7 +1468,7 @@ private: 16, offset, pick(1, 2, 4, 8, 16), ptr, value, type); } case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -1565,7 +1565,7 @@ private: return Literal(getDouble()); case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -1610,7 +1610,7 @@ private: return Literal(double(small)); case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -1678,7 +1678,7 @@ private: break; case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -1712,7 +1712,7 @@ private: break; case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -1824,7 +1824,7 @@ private: make(Type::v128)}); } case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: return makeTrivial(type); @@ -1969,7 +1969,7 @@ private: WASM_UNREACHABLE("invalid value"); } case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -2206,7 +2206,7 @@ private: make(Type::v128)}); } case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -2413,7 +2413,7 @@ private: break; case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: case Type::none: @@ -2588,9 +2588,10 @@ private: assert(wasm.features.hasReferenceTypes()); Type refType; if (wasm.features.hasExceptionHandling()) { - refType = pick(Type::funcref, Type::anyref, Type::nullref, Type::exnref); + refType = + pick(Type::funcref, Type::externref, Type::nullref, Type::exnref); } else { - refType = pick(Type::funcref, Type::anyref, Type::nullref); + refType = pick(Type::funcref, Type::externref, Type::nullref); } return builder.makeRefIsNull(make(refType)); } @@ -2657,7 +2658,7 @@ private: .add(FeatureSet::SIMD, Type::v128) .add(FeatureSet::ReferenceTypes, Type::funcref, - Type::anyref, + Type::externref, Type::nullref) .add(FeatureSet::ReferenceTypes | FeatureSet::ExceptionHandling, Type::exnref)); @@ -2700,7 +2701,7 @@ private: // - funcref cannot be logged because referenced functions can be inlined or // removed during optimization - // - there's no point in logging anyref because it is opaque + // - there's no point in logging externref because it is opaque // - don't bother logging tuples std::vector<Type> getLoggableTypes() { return items( diff --git a/src/tools/spec-wrapper.h b/src/tools/spec-wrapper.h index c6b6cc9c9..a77dfc43f 100644 --- a/src/tools/spec-wrapper.h +++ b/src/tools/spec-wrapper.h @@ -49,7 +49,7 @@ static std::string generateSpecWrapper(Module& wasm) { ret += "(v128.const i32x4 0 0 0 0)"; break; case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: ret += "(ref.null)"; diff --git a/src/tools/wasm-reduce.cpp b/src/tools/wasm-reduce.cpp index d55dab893..ab593c76c 100644 --- a/src/tools/wasm-reduce.cpp +++ b/src/tools/wasm-reduce.cpp @@ -594,7 +594,7 @@ struct Reducer break; case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: continue; // not implemented yet @@ -619,7 +619,7 @@ struct Reducer break; case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: continue; // not implemented yet @@ -644,7 +644,7 @@ struct Reducer break; case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: continue; // not implemented yet @@ -669,7 +669,7 @@ struct Reducer WASM_UNREACHABLE("unexpected type"); case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: continue; // not implemented yet @@ -681,7 +681,7 @@ struct Reducer } case Type::v128: case Type::funcref: - case Type::anyref: + case Type::externref: case Type::nullref: case Type::exnref: continue; // not implemented yet |