Skip to content

Commit

Permalink
rm -r gc
Browse files Browse the repository at this point in the history
  • Loading branch information
@dcodeIO
dcodeIO committed Sep 7, 2020
1 parent c24f90c commit 8a24ee6
Show file tree
Hide file tree
Showing 27 changed files with 18 additions and 273 deletions.
9 changes: 0 additions & 9 deletions src/asmjs/asm_v_wasm.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,6 @@ AsmType wasmToAsmType(Type type) {
assert(false && "v128 not implemented yet");
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
assert(false && "reference types are not supported by asm2wasm");
case Type::none:
Expand Down Expand Up @@ -86,12 +83,6 @@ char getSig(Type type) {
return 'F';
case Type::externref:
return 'X';
case Type::anyref:
return 'A';
case Type::eqref:
return 'Q';
case Type::i31ref:
return 'I';
case Type::exnref:
return 'E';
case Type::none:
Expand Down
6 changes: 0 additions & 6 deletions src/binaryen-c.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,12 +74,9 @@ BinaryenLiteral toBinaryenLiteral(Literal x) {
}
break;
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::exnref:
assert(x.isNull());
break;
case Type::i31ref:
case Type::none:
case Type::unreachable:
WASM_UNREACHABLE("unexpected type");
Expand All @@ -102,11 +99,8 @@ Literal fromBinaryenLiteral(BinaryenLiteral x) {
case Type::funcref:
return Literal::makeFunc(x.func);
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::exnref:
return Literal::makeNull(Type(x.type));
case Type::i31ref:
case Type::none:
case Type::unreachable:
WASM_UNREACHABLE("unexpected type");
Expand Down
6 changes: 0 additions & 6 deletions src/ir/abstract.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -103,9 +103,6 @@ inline UnaryOp getUnary(Type type, Op op) {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable: {
Expand Down Expand Up @@ -270,9 +267,6 @@ inline BinaryOp getBinary(Type type, Op op) {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable: {
Expand Down
3 changes: 0 additions & 3 deletions src/literal.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -576,9 +576,6 @@ template<> struct less<wasm::Literal> {
return memcmp(a.getv128Ptr(), b.getv128Ptr(), 16) < 0;
case wasm::Type::funcref:
case wasm::Type::externref:
case wasm::Type::anyref:
case wasm::Type::eqref:
case wasm::Type::i31ref:
case wasm::Type::exnref:
case wasm::Type::none:
case wasm::Type::unreachable:
Expand Down
3 changes: 0 additions & 3 deletions src/parsing.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,9 +265,6 @@ parseConst(cashew::IString s, Type type, MixedArena& allocator) {
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
WASM_UNREACHABLE("unexpected const type");
case Type::none:
Expand Down
3 changes: 0 additions & 3 deletions src/passes/ConstHoisting.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,9 +96,6 @@ struct ConstHoisting : public WalkerPass<PostWalker<ConstHoisting>> {
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref: {
return false;
}
Expand Down
6 changes: 0 additions & 6 deletions src/passes/FuncCastEmulation.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@ static Expression* toABI(Expression* value, Module* module) {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref: {
WASM_UNREACHABLE("reference types cannot be converted to i64");
}
Expand Down Expand Up @@ -113,9 +110,6 @@ static Expression* fromABI(Expression* value, Type type, Module* module) {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref: {
WASM_UNREACHABLE("reference types cannot be converted from i64");
}
Expand Down
37 changes: 0 additions & 37 deletions src/passes/InstrumentLocals.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,15 +102,6 @@ struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
case Type::externref:
import = get_externref;
break;
case Type::anyref:
import = get_anyref;
break;
case Type::eqref:
import = get_eqref;
break;
case Type::i31ref:
import = get_i31ref;
break;
case Type::exnref:
import = get_exnref;
break;
Expand Down Expand Up @@ -157,15 +148,6 @@ struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
case Type::externref:
import = set_externref;
break;
case Type::anyref:
import = set_anyref;
break;
case Type::eqref:
import = set_eqref;
break;
case Type::i31ref:
import = set_i31ref;
break;
case Type::exnref:
import = set_exnref;
break;
Expand Down Expand Up @@ -208,25 +190,6 @@ struct InstrumentLocals : public WalkerPass<PostWalker<InstrumentLocals>> {
set_externref,
{Type::i32, Type::i32, Type::externref},
Type::externref);
// TODO (GC)
// if (curr->features.hasGC()) {
// addImport(
// curr, get_anyref, {Type::i32, Type::i32, Type::anyref},
// Type::anyref);
// addImport(
// curr, set_anyref, {Type::i32, Type::i32, Type::anyref},
// Type::anyref);
// addImport(
// curr, get_eqref, {Type::i32, Type::i32, Type::eqref}, Type::eqref);
// addImport(
// curr, set_eqref, {Type::i32, Type::i32, Type::eqref}, Type::eqref);
// addImport(
// curr, get_i31ref, {Type::i32, Type::i32, Type::i31ref},
// Type::i31ref);
// addImport(
// curr, set_i31ref, {Type::i32, Type::i32, Type::i31ref},
// Type::i31ref);
// }
}
if (curr->features.hasExceptionHandling()) {
addImport(
Expand Down
3 changes: 0 additions & 3 deletions src/shell-interface.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,12 +117,9 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface {
assert(false && "v128 not implemented yet");
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::exnref:
globals[import->name] = {Literal::makeNull(import->type)};
break;
case Type::i31ref:
case Type::none:
case Type::unreachable:
WASM_UNREACHABLE("unexpected type");
Expand Down
38 changes: 0 additions & 38 deletions src/tools/fuzzing.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -322,14 +322,6 @@ class TranslateToFuzzReader {
case Type::funcref:
case Type::exnref:
break;
case Type::anyref:
// TODO (GC)
// includes externref, funcref, exnref, eqref (incl. subtypes)
case Type::eqref:
// TODO (GC)
// includes i31ref, concrete structs and arrays
case Type::i31ref:
WASM_UNREACHABLE("TODO: GC types");
default:
break;
}
Expand Down Expand Up @@ -1366,9 +1358,6 @@ class TranslateToFuzzReader {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down Expand Up @@ -1472,9 +1461,6 @@ class TranslateToFuzzReader {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down Expand Up @@ -1603,9 +1589,6 @@ class TranslateToFuzzReader {
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down Expand Up @@ -1650,9 +1633,6 @@ class TranslateToFuzzReader {
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down Expand Up @@ -1720,9 +1700,6 @@ class TranslateToFuzzReader {
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand All @@ -1749,9 +1726,6 @@ class TranslateToFuzzReader {
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down Expand Up @@ -1861,9 +1835,6 @@ class TranslateToFuzzReader {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
return makeTrivial(type);
case Type::none:
Expand Down Expand Up @@ -2008,9 +1979,6 @@ class TranslateToFuzzReader {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down Expand Up @@ -2247,9 +2215,6 @@ class TranslateToFuzzReader {
}
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down Expand Up @@ -2456,9 +2421,6 @@ class TranslateToFuzzReader {
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
case Type::none:
case Type::unreachable:
Expand Down
9 changes: 0 additions & 9 deletions src/tools/spec-wrapper.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,9 @@ static std::string generateSpecWrapper(Module& wasm) {
case Type::externref:
ret += "(ref.null extern)";
break;
case Type::anyref:
ret += "(ref.null any)";
break;
case Type::eqref:
ret += "(ref.null eq)";
break;
case Type::exnref:
ret += "(ref.null exn)";
break;
case Type::i31ref:
ret += "(i31.new (i32.const 0))";
break;
case Type::none:
case Type::unreachable:
WASM_UNREACHABLE("unexpected type");
Expand Down
15 changes: 0 additions & 15 deletions src/tools/wasm-reduce.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -597,9 +597,6 @@ struct Reducer
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
continue; // not implemented yet
case Type::none:
Expand All @@ -625,9 +622,6 @@ struct Reducer
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
continue; // not implemented yet
case Type::none:
Expand All @@ -653,9 +647,6 @@ struct Reducer
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
continue; // not implemented yet
case Type::none:
Expand All @@ -681,9 +672,6 @@ struct Reducer
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
continue; // not implemented yet
case Type::none:
Expand All @@ -695,9 +683,6 @@ struct Reducer
case Type::v128:
case Type::funcref:
case Type::externref:
case Type::anyref:
case Type::eqref:
case Type::i31ref:
case Type::exnref:
continue; // not implemented yet
case Type::none:
Expand Down
9 changes: 0 additions & 9 deletions src/wasm-binary.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -990,15 +990,6 @@ inline S32LEB binaryType(Type type) {
case Type::externref:
ret = BinaryConsts::EncodedType::externref;
break;
case Type::anyref:
ret = BinaryConsts::EncodedType::anyref;
break;
case Type::eqref:
ret = BinaryConsts::EncodedType::eqref;
break;
case Type::i31ref:
ret = BinaryConsts::EncodedType::i31ref;
break;
case Type::exnref:
ret = BinaryConsts::EncodedType::exnref;
break;
Expand Down
Loading

0 comments on commit 8a24ee6

Please sign in to comment.