operator fix

Author: aheejin

src/wasm/wasm-type.cpp

@@ -56,7 +56,7 @@ std::vector<std::unique_ptr<std::vector<Type>>> typeLists = [] {
   };
 
   add({});
-  add({});
+  add({Type::unreachable});
   add({Type::i32});
   add({Type::i64});
   add({Type::f32});
@@ -71,7 +71,7 @@ std::vector<std::unique_ptr<std::vector<Type>>> typeLists = [] {
 
 std::unordered_map<std::vector<Type>, uint32_t> indices = {
   {{}, Type::none},
-  {{}, Type::unreachable},
+  {{Type::unreachable}, Type::unreachable},
   {{Type::i32}, Type::i32},
   {{Type::i64}, Type::i64},
   {{Type::f32}, Type::f32},
@@ -139,14 +139,6 @@ const std::vector<Type>& Type::expand() const {
 }
 
 bool Type::operator<(const Type& other) const {
-  // Both none and unreachable do not have a vector to expand, so we have to
-  // handle them specially here.
-  if (id == none && other.id == unreachable) {
-    return true;
-  } else if (id == unreachable && other.id == none) {
-    return false;
-  }
-
   const std::vector<Type>& these = expand();
   const std::vector<Type>& others = other.expand();
   return std::lexicographical_compare(

test/example/c-api-kitchen-sink.c

@@ -161,7 +161,7 @@ void test_types() {
   printf("  // BinaryenTypeUnreachable: %d\n", unreachable);
   assert(BinaryenTypeArity(unreachable) == 0);
   BinaryenTypeExpand(unreachable, &valueType);
-  assert(valueType == 0xdeadbeef);
+  assert(valueType == unreachable);
 
   BinaryenType i32 = BinaryenTypeInt32();
   printf("  // BinaryenTypeInt32: %d\n", i32);