summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/tools/fuzzing/fuzzing.cpp6
-rw-r--r--src/tools/tool-options.h17
-rw-r--r--src/tools/wasm-fuzz-types.cpp19
-rw-r--r--src/tools/wasm-reduce.cpp7
4 files changed, 2 insertions, 47 deletions
diff --git a/src/tools/fuzzing/fuzzing.cpp b/src/tools/fuzzing/fuzzing.cpp
index 6ce299822..062e66260 100644
--- a/src/tools/fuzzing/fuzzing.cpp
+++ b/src/tools/fuzzing/fuzzing.cpp
@@ -2260,14 +2260,12 @@ Expression* TranslateToFuzzReader::makeBasicRef(Type type) {
assert(wasm.features.hasGC());
// TODO: Construct nontrivial types. For now just create a hard coded
// struct.
- // Use a local static to avoid creating a fresh nominal types in
- // --nominal mode.
+ // Use a local static to avoid the expense of canonicalizing a new type
+ // every time.
static HeapType trivialStruct = HeapType(Struct());
return builder.makeStructNew(trivialStruct, std::vector<Expression*>{});
}
case HeapType::array: {
- // Use a local static to avoid creating a fresh nominal types in
- // --nominal mode.
static HeapType trivialArray =
HeapType(Array(Field(Field::PackedType::i8, Immutable)));
return builder.makeArrayNewFixed(trivialArray, {});
diff --git a/src/tools/tool-options.h b/src/tools/tool-options.h
index 02b825079..4e9d85d00 100644
--- a/src/tools/tool-options.h
+++ b/src/tools/tool-options.h
@@ -140,23 +140,6 @@ struct ToolOptions : public Options {
}
passOptions.arguments[key] = value;
})
- .add("--nominal",
- "",
- "Force all GC type definitions to be parsed as nominal.",
- ToolOptionsCategory,
- Options::Arguments::Zero,
- [](Options* o, const std::string& argument) {
- setTypeSystem(TypeSystem::Nominal);
- })
- .add("--hybrid",
- "",
- "Force all GC type definitions to be parsed using the isorecursive "
- "hybrid type system.",
- ToolOptionsCategory,
- Options::Arguments::Zero,
- [](Options* o, const std::string& argument) {
- setTypeSystem(TypeSystem::Isorecursive);
- })
.add(
"--closed-world",
"-cw",
diff --git a/src/tools/wasm-fuzz-types.cpp b/src/tools/wasm-fuzz-types.cpp
index 44572c85d..ce393d133 100644
--- a/src/tools/wasm-fuzz-types.cpp
+++ b/src/tools/wasm-fuzz-types.cpp
@@ -559,27 +559,8 @@ int main(int argc, const char* argv[]) {
Options::Arguments::Zero,
[&](Options*, const std::string& arg) { verbose = true; });
- TypeSystem system = TypeSystem::Isorecursive;
- options.add(
- "--nominal",
- "",
- "Use the nominal type system",
- WasmFuzzTypesOption,
- Options::Arguments::Zero,
- [&](Options*, const std::string& arg) { system = TypeSystem::Nominal; });
- options.add("--hybrid",
- "",
- "Use the isorecursive hybrid type system (default)",
- WasmFuzzTypesOption,
- Options::Arguments::Zero,
- [&](Options*, const std::string& arg) {
- system = TypeSystem::Isorecursive;
- });
-
options.parse(argc, argv);
- setTypeSystem(system);
-
Fuzzer fuzzer{verbose};
if (seed) {
// Run just a single workload with the given seed.
diff --git a/src/tools/wasm-reduce.cpp b/src/tools/wasm-reduce.cpp
index 895b7d8bc..40d9aba6a 100644
--- a/src/tools/wasm-reduce.cpp
+++ b/src/tools/wasm-reduce.cpp
@@ -1296,13 +1296,6 @@ int main(int argc, const char* argv[]) {
if (debugInfo) {
extraFlags += " -g ";
}
- if (getTypeSystem() == TypeSystem::Nominal) {
- extraFlags += " --nominal";
- } else if (getTypeSystem() == TypeSystem::Isorecursive) {
- extraFlags += " --hybrid";
- } else {
- WASM_UNREACHABLE("unexpected type system");
- }
if (test.size() == 0) {
Fatal() << "test file not provided\n";