Commit 3721b380 authored by nagayama15's avatar nagayama15

Merge branch 'update-binaryen-1.38.31' into 'master'

Update Binaryen

See merge request !4
parents 4bf1e9f1 f39cc0bf
ExternalProject_Add( ExternalProject_Add(
binaryen binaryen
URL https://github.com/WebAssembly/binaryen/archive/1.38.30.tar.gz URL https://github.com/WebAssembly/binaryen/archive/91704fbae74fa7c89a017764eaa5ff03eda5ec0d.tar.gz
PREFIX binaryen PREFIX binaryen
INSTALL_COMMAND "" INSTALL_COMMAND ""
TEST_COMMAND "" TEST_COMMAND ""
......
...@@ -261,10 +261,11 @@ namespace wasm { ...@@ -261,10 +261,11 @@ namespace wasm {
std::tie(r.type, r.offset, *r.ptr, *r.expected, *r.timeout); std::tie(r.type, r.offset, *r.ptr, *r.expected, *r.timeout);
} }
case Expression::Id::AtomicWakeId: { case Expression::Id::AtomicNotifyId: {
const auto &l = *lhs.cast<AtomicWake>(); const auto &l = *lhs.cast<AtomicNotify>();
const auto &r = *rhs.cast<AtomicWake>(); const auto &r = *rhs.cast<AtomicNotify>();
return std::tie(l.type, l.offset, *l.ptr, *l.wakeCount) < std::tie(r.type, r.offset, *r.ptr, *r.wakeCount); return std::tie(l.type, l.offset, *l.ptr, *l.notifyCount) <
std::tie(r.type, r.offset, *r.ptr, *r.notifyCount);
} }
case Expression::Id::SIMDExtractId: { case Expression::Id::SIMDExtractId: {
...@@ -333,20 +334,10 @@ namespace wasm { ...@@ -333,20 +334,10 @@ namespace wasm {
} }
inline bool operator<(const ExpressionList &lhs, const ExpressionList &rhs) noexcept { inline bool operator<(const ExpressionList &lhs, const ExpressionList &rhs) noexcept {
auto lIt = lhs.begin(); return std::lexicographical_compare(
auto lEnd = lhs.end(); std::begin(lhs), std::end(lhs), std::begin(rhs), std::end(rhs), [](const auto &a, const auto &b) {
auto rIt = rhs.begin(); return *a < *b;
auto rEnd = rhs.end(); });
for (; lIt != lEnd && rIt != rEnd; ++lIt, ++rIt) {
if (**lIt < **rIt) {
return true;
} else if (**rIt < **lIt) {
return false;
}
}
return !(lIt != lEnd) && rIt != rEnd;
} }
} // namespace wasm } // namespace wasm
......
...@@ -135,9 +135,9 @@ namespace kyut::pass { ...@@ -135,9 +135,9 @@ namespace kyut::pass {
return true; return true;
} }
bool visitAtomicWake(wasm::AtomicWake *curr) { bool visitAtomicNotify(wasm::AtomicNotify *curr) {
visit(curr->ptr); visit(curr->ptr);
visit(curr->wakeCount); visit(curr->notifyCount);
return true; return true;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment