From c527336c70b0377f4a91091ee37e5e094fd609e5 Mon Sep 17 00:00:00 2001 From: MaxGraey Date: Sun, 25 Oct 2020 17:07:23 +0200 Subject: [PATCH] update to latest --- package-lock.json | 6 ++--- package.json | 2 +- tests/compiler/number.optimized.wat | 4 ---- tests/compiler/resolve-binary.optimized.wat | 4 ---- tests/compiler/resolve-ternary.optimized.wat | 4 ---- tests/compiler/std/math.optimized.wat | 24 +++++--------------- tests/compiler/std/mod.optimized.wat | 12 +++------- tests/compiler/std/typedarray.optimized.wat | 8 ++----- 8 files changed, 15 insertions(+), 49 deletions(-) diff --git a/package-lock.json b/package-lock.json index 50232a707c..9ee80e6468 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1144,9 +1144,9 @@ "optional": true }, "binaryen": { - "version": "98.0.0-nightly.20201022", - "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-98.0.0-nightly.20201022.tgz", - "integrity": "sha512-JPKF0U3oHk5qgXUkG3k3POAnutdsUCjXF4RCNJCyUlcqMpDOlZUO+oKb0GPNrFfs+tk609HYqijdFqz2Rs+10w==" + "version": "98.0.0-nightly.20201025", + "resolved": "https://registry.npmjs.org/binaryen/-/binaryen-98.0.0-nightly.20201025.tgz", + "integrity": "sha512-jS6VMHF2mRKMBy79DhMDX+j1ph+TahHhLazkybvr90WkXBa80ydWgLTZLe3mxms1iOHJYqFv84TrKCrlFiwzjA==" }, "bluebird": { "version": "3.7.2", diff --git a/package.json b/package.json index f9f5e2a90a..348327f4d6 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,7 @@ "url": "https://github.com/AssemblyScript/assemblyscript/issues" }, "dependencies": { - "binaryen": "98.0.0-nightly.20201022", + "binaryen": "98.0.0-nightly.20201025", "long": "^4.0.0", "source-map-support": "^0.5.19", "ts-node": "^6.2.0" diff --git a/tests/compiler/number.optimized.wat b/tests/compiler/number.optimized.wat index 92842bebc1..3377ad615e 100644 --- a/tests/compiler/number.optimized.wat +++ b/tests/compiler/number.optimized.wat @@ -1212,8 +1212,6 @@ local.get $1 i64.const 31 i64.shl - i64.const 0 - i64.add local.tee $2 i64.const 32 i64.shr_u @@ -1221,8 +1219,6 @@ local.get $2 i64.const 4294967295 i64.and - i64.const 0 - i64.add i64.const 2147483647 i64.add i64.const 32 diff --git a/tests/compiler/resolve-binary.optimized.wat b/tests/compiler/resolve-binary.optimized.wat index 0cae5922a2..3466deb879 100644 --- a/tests/compiler/resolve-binary.optimized.wat +++ b/tests/compiler/resolve-binary.optimized.wat @@ -1224,8 +1224,6 @@ local.get $1 i64.const 31 i64.shl - i64.const 0 - i64.add local.tee $3 i64.const 32 i64.shr_u @@ -1233,8 +1231,6 @@ local.get $3 i64.const 4294967295 i64.and - i64.const 0 - i64.add i64.const 2147483647 i64.add i64.const 32 diff --git a/tests/compiler/resolve-ternary.optimized.wat b/tests/compiler/resolve-ternary.optimized.wat index 44d585fb1b..bd5f0c7304 100644 --- a/tests/compiler/resolve-ternary.optimized.wat +++ b/tests/compiler/resolve-ternary.optimized.wat @@ -2380,8 +2380,6 @@ local.get $1 i64.const 31 i64.shl - i64.const 0 - i64.add local.tee $2 i64.const 32 i64.shr_u @@ -2389,8 +2387,6 @@ local.get $2 i64.const 4294967295 i64.and - i64.const 0 - i64.add i64.const 2147483647 i64.add i64.const 32 diff --git a/tests/compiler/std/math.optimized.wat b/tests/compiler/std/math.optimized.wat index d5f4f21ebd..0be7bd82f2 100644 --- a/tests/compiler/std/math.optimized.wat +++ b/tests/compiler/std/math.optimized.wat @@ -6538,7 +6538,7 @@ i64.eqz if (result i64) local.get $2 - i64.const 0 + i64.const 1 local.get $4 local.get $2 i64.const 12 @@ -6547,8 +6547,6 @@ i64.sub local.tee $4 i64.sub - i64.const 1 - i64.add i64.shl else local.get $2 @@ -6562,7 +6560,7 @@ i64.eqz if (result i64) local.get $3 - i64.const 0 + i64.const 1 local.get $5 local.get $3 i64.const 12 @@ -6571,8 +6569,6 @@ i64.sub local.tee $5 i64.sub - i64.const 1 - i64.add i64.shl else local.get $3 @@ -6648,11 +6644,9 @@ i64.or else local.get $2 - i64.const 0 + i64.const 1 local.get $4 i64.sub - i64.const 1 - i64.add i64.shr_u end local.get $7 @@ -8347,7 +8341,7 @@ i64.eqz if (result i64) local.get $2 - i64.const 0 + i64.const 1 local.get $3 local.get $2 i64.const 12 @@ -8356,8 +8350,6 @@ i64.sub local.tee $3 i64.sub - i64.const 1 - i64.add i64.shl else local.get $2 @@ -8371,7 +8363,7 @@ i64.eqz if (result i64) local.get $4 - i64.const 0 + i64.const 1 local.get $5 local.get $4 i64.const 12 @@ -8380,8 +8372,6 @@ i64.sub local.tee $5 i64.sub - i64.const 1 - i64.add i64.shl else local.get $4 @@ -8488,11 +8478,9 @@ i64.shl i64.or local.get $2 - i64.const 0 + i64.const 1 local.get $3 i64.sub - i64.const 1 - i64.add i64.shr_u local.get $3 i64.const 0 diff --git a/tests/compiler/std/mod.optimized.wat b/tests/compiler/std/mod.optimized.wat index 74ba9ad2ae..bb2ae1418a 100644 --- a/tests/compiler/std/mod.optimized.wat +++ b/tests/compiler/std/mod.optimized.wat @@ -96,7 +96,7 @@ i64.eqz if (result i64) local.get $2 - i64.const 0 + i64.const 1 local.get $4 local.get $2 i64.const 12 @@ -105,8 +105,6 @@ i64.sub local.tee $4 i64.sub - i64.const 1 - i64.add i64.shl else local.get $2 @@ -120,7 +118,7 @@ i64.eqz if (result i64) local.get $3 - i64.const 0 + i64.const 1 local.get $5 local.get $3 i64.const 12 @@ -129,8 +127,6 @@ i64.sub local.tee $5 i64.sub - i64.const 1 - i64.add i64.shl else local.get $3 @@ -206,11 +202,9 @@ i64.or else local.get $2 - i64.const 0 + i64.const 1 local.get $4 i64.sub - i64.const 1 - i64.add i64.shr_u end local.get $7 diff --git a/tests/compiler/std/typedarray.optimized.wat b/tests/compiler/std/typedarray.optimized.wat index b4ae8845eb..2b7d584dfd 100644 --- a/tests/compiler/std/typedarray.optimized.wat +++ b/tests/compiler/std/typedarray.optimized.wat @@ -9857,7 +9857,7 @@ i64.eqz if (result i64) local.get $1 - i64.const 0 + i64.const 1 local.get $2 local.get $1 i64.const 12 @@ -9866,8 +9866,6 @@ i64.sub local.tee $2 i64.sub - i64.const 1 - i64.add i64.shl else local.get $1 @@ -9943,11 +9941,9 @@ i64.or else local.get $1 - i64.const 0 + i64.const 1 local.get $2 i64.sub - i64.const 1 - i64.add i64.shr_u end local.get $4