fix embedding method

lib/kyut/Reordering-inl.hpp

@@ -105,7 +105,10 @@ namespace kyut {
                 const auto it = chunk_begin + i;
 
                 // Find the position of `begin + i`.
-                const auto found = std::find(it, std::end(chunk), begin + i);
+                const auto found = std::find_if(it, std::end(chunk), [&](const auto& a) {
+                    return !less(*a, *(begin + i)) && !less(*(begin + i), *a);
+                });
+
                 assert(found != std::end(chunk));
 
                 const std::size_t pos = std::distance(it, found);

lib/kyut/SafeUnique.hpp

@@ -15,15 +15,14 @@ namespace kyut {
         std::vector<typename std::iterator_traits<Iterator>::value_type> a, b;
 
         auto it = begin;
-        a.emplace_back(std::move(*it++));
+        a.emplace_back(std::move(*it));
 
-        while (it != end) {
+        while (++it != end) {
             if (pred(a.back(), *it)) {
                 b.emplace_back(std::move(*it));
             } else {
                 a.emplace_back(std::move(*it));
             }
-            ++it;
         }
 
         it = begin;

lib/kyut/wasm-ext/Compare-inl.hpp

@@ -22,6 +22,10 @@ namespace wasm {
             return *p;
         };
 
+        if (&a == &b) {
+            return false;
+        }
+
         if (a._id != b._id) {
             return a._id < b._id;
         }
@@ -347,6 +351,10 @@ namespace wasm {
     }
 
     inline bool operator<(const ExpressionList& a, const ExpressionList& b) {
+        if (&a == &b) {
+            return false;
+        }
+
         if (a.size() != b.size()) {
             return a.size() < b.size();
         }
@@ -362,6 +370,10 @@ namespace wasm {
     }
 
     inline bool operator<(const Function& a, const Function& b) {
+        if (&a == &b) {
+            return false;
+        }
+
         // wasm::Function::getNumVars() does not modify states
         return std::forward_as_tuple(a.sig, const_cast<Function&>(a).getNumVars(), *a.body) <
                std::forward_as_tuple(b.sig, const_cast<Function&>(b).getNumVars(), *b.body);