Update binaryen-c/binaryen.js, fixes #1028, fixes #1029 (#1030)

This PR adds global variable support (addGlobal, getGlobal, setGlobal), host operations (currentMemory, growMemory), a few utility functions (removeImport, removeExport, getFunctionTypeBySignature with the latter being scheduled for removal once a better alternative is in place) and it introduces an additional argument to specify the result type in BinaryenBlock (effectively breaking the C-API but retaining previous behaviour by introducing the BinaryenUndefined() type for this purpose). Additionally, it enables compilation with exception support in build-js.sh as exceptions are thrown and caught when optimizing endless loops, intentionally resulting in an unreachable opcode. Affected test cases have been updated accordingly.

1 files changed, 31 insertions, 31 deletions

diff --git a/test/example/c-api-relooper-unreachable-if.cpp b/test/example/c-api-relooper-unreachable-if.cpp
index 590db8e67..b6f7f8b04 100644
--- a/test/example/c-api-relooper-unreachable-if.cpp
+++ b/test/example/c-api-relooper-unreachable-if.cpp
@@ -25,11 +25,11 @@ int main() {
   expressions[4] = BinaryenReturn(the_module, expressions[0]);
   {
     BinaryenExpressionRef children[] = { expressions[3], expressions[4] };
-    expressions[5] = BinaryenBlock(the_module, "bb0", children, 2);
+    expressions[5] = BinaryenBlock(the_module, "bb0", children, 2, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[5]);
   {
-    BinaryenIndex paramTypes[] = { 0 };
+    BinaryenType paramTypes[] = { 0 };
     functionTypes[0] = BinaryenAddFunctionType(the_module, "rustfn-0-40", 0, paramTypes, 0);
   }
   expressions[6] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -50,7 +50,7 @@ int main() {
   expressions[13] = BinaryenReturn(the_module, expressions[0]);
   {
     BinaryenExpressionRef children[] = { expressions[12], expressions[13] };
-    expressions[14] = BinaryenBlock(the_module, "bb0", children, 2);
+    expressions[14] = BinaryenBlock(the_module, "bb0", children, 2, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[14]);
   expressions[15] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -67,18 +67,18 @@ int main() {
   the_relooper = RelooperCreate();
   {
     BinaryenExpressionRef children[] = { 0 };
-    expressions[19] = BinaryenBlock(the_module, "bb0", children, 0);
+    expressions[19] = BinaryenBlock(the_module, "bb0", children, 0, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[19]);
   {
     BinaryenExpressionRef children[] = { 0 };
-    expressions[20] = BinaryenBlock(the_module, "bb1", children, 0);
+    expressions[20] = BinaryenBlock(the_module, "bb1", children, 0, BinaryenUndefined());
   }
   relooperBlocks[1] = RelooperAddBlock(the_relooper, expressions[20]);
   RelooperAddBranch(relooperBlocks[0], relooperBlocks[1], expressions[0], expressions[0]);
   RelooperAddBranch(relooperBlocks[1], relooperBlocks[1], expressions[0], expressions[0]);
   {
-    BinaryenIndex paramTypes[] = { 0 };
+    BinaryenType paramTypes[] = { 0 };
     functionTypes[1] = BinaryenAddFunctionType(the_module, "rustfn-0-42", 0, paramTypes, 0);
   }
   expressions[21] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -99,7 +99,7 @@ int main() {
   expressions[28] = BinaryenReturn(the_module, expressions[0]);
   {
     BinaryenExpressionRef children[] = { expressions[27], expressions[28] };
-    expressions[29] = BinaryenBlock(the_module, "bb0", children, 2);
+    expressions[29] = BinaryenBlock(the_module, "bb0", children, 2, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[29]);
   expressions[30] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -120,7 +120,7 @@ int main() {
   expressions[37] = BinaryenReturn(the_module, expressions[0]);
   {
     BinaryenExpressionRef children[] = { expressions[36], expressions[37] };
-    expressions[38] = BinaryenBlock(the_module, "bb0", children, 2);
+    expressions[38] = BinaryenBlock(the_module, "bb0", children, 2, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[38]);
   expressions[39] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -140,7 +140,7 @@ int main() {
   expressions[45] = BinaryenGetLocal(the_module, 1, 1);
   expressions[46] = BinaryenSetLocal(the_module, 2, expressions[45]);
   {
-    BinaryenIndex paramTypes[] = { 1 };
+    BinaryenType paramTypes[] = { 1 };
     functionTypes[2] = BinaryenAddFunctionType(the_module, "print_i32", 0, paramTypes, 1);
   }
   BinaryenAddImport(the_module, "print_i32", "spectest", "print", functionTypes[2]);
@@ -151,7 +151,7 @@ int main() {
   }
   {
     BinaryenExpressionRef children[] = { expressions[44], expressions[46], expressions[48] };
-    expressions[49] = BinaryenBlock(the_module, "bb0", children, 3);
+    expressions[49] = BinaryenBlock(the_module, "bb0", children, 3, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[49]);
   expressions[50] = BinaryenGetLocal(the_module, 3, 1);
@@ -160,12 +160,12 @@ int main() {
   expressions[53] = BinaryenReturn(the_module, expressions[0]);
   {
     BinaryenExpressionRef children[] = { expressions[52], expressions[53] };
-    expressions[54] = BinaryenBlock(the_module, "bb1", children, 2);
+    expressions[54] = BinaryenBlock(the_module, "bb1", children, 2, BinaryenUndefined());
   }
   relooperBlocks[1] = RelooperAddBlock(the_relooper, expressions[54]);
   RelooperAddBranch(relooperBlocks[0], relooperBlocks[1], expressions[0], expressions[0]);
   {
-    BinaryenIndex paramTypes[] = { 1 };
+    BinaryenType paramTypes[] = { 1 };
     functionTypes[3] = BinaryenAddFunctionType(the_module, "rustfn-0-49", 0, paramTypes, 1);
   }
   expressions[55] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -207,7 +207,7 @@ int main() {
   expressions[83] = BinaryenStore(the_module, 4, 4, 0, expressions[81], expressions[74], 1);
   {
     BinaryenExpressionRef children[] = { expressions[60], expressions[62], expressions[68], expressions[80], expressions[82], expressions[83] };
-    expressions[84] = BinaryenBlock(the_module, "bb0", children, 6);
+    expressions[84] = BinaryenBlock(the_module, "bb0", children, 6, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[84]);
   expressions[85] = BinaryenGetLocal(the_module, 3, 1);
@@ -224,7 +224,7 @@ int main() {
   expressions[96] = BinaryenReturn(the_module, expressions[95]);
   {
     BinaryenExpressionRef children[] = { expressions[87], expressions[89], expressions[91], expressions[94], expressions[96] };
-    expressions[97] = BinaryenBlock(the_module, "bb1", children, 5);
+    expressions[97] = BinaryenBlock(the_module, "bb1", children, 5, BinaryenUndefined());
   }
   relooperBlocks[1] = RelooperAddBlock(the_relooper, expressions[97]);
   expressions[98] = BinaryenGetLocal(the_module, 3, 1);
@@ -234,7 +234,7 @@ int main() {
   relooperBlocks[2] = RelooperAddBlock(the_relooper, expressions[100]);
   RelooperAddBranch(relooperBlocks[0], relooperBlocks[2], expressions[0], expressions[0]);
   {
-    BinaryenIndex paramTypes[] = { 0 };
+    BinaryenType paramTypes[] = { 0 };
     functionTypes[4] = BinaryenAddFunctionType(the_module, "rustfn-0-54", 1, paramTypes, 0);
   }
   expressions[101] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -258,7 +258,7 @@ int main() {
   expressions[108] = BinaryenSetLocal(the_module, 4, expressions[107]);
   {
     BinaryenExpressionRef children[] = { expressions[106], expressions[108] };
-    expressions[109] = BinaryenBlock(the_module, "bb0", children, 2);
+    expressions[109] = BinaryenBlock(the_module, "bb0", children, 2, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[109]);
   expressions[110] = BinaryenGetLocal(the_module, 4, 1);
@@ -284,7 +284,7 @@ int main() {
   expressions[130] = BinaryenStore(the_module, 4, 4, 0, expressions[128], expressions[121], 1);
   {
     BinaryenExpressionRef children[] = { expressions[115], expressions[127], expressions[129], expressions[130] };
-    expressions[131] = BinaryenBlock(the_module, "bb1", children, 4);
+    expressions[131] = BinaryenBlock(the_module, "bb1", children, 4, BinaryenUndefined());
   }
   relooperBlocks[1] = RelooperAddBlock(the_relooper, expressions[131]);
   expressions[132] = BinaryenGetLocal(the_module, 5, 1);
@@ -299,7 +299,7 @@ int main() {
   }
   {
     BinaryenExpressionRef children[] = { expressions[134], expressions[136], expressions[138] };
-    expressions[139] = BinaryenBlock(the_module, "bb2", children, 3);
+    expressions[139] = BinaryenBlock(the_module, "bb2", children, 3, BinaryenUndefined());
   }
   relooperBlocks[2] = RelooperAddBlock(the_relooper, expressions[139]);
   expressions[140] = BinaryenGetLocal(the_module, 3, 1);
@@ -313,7 +313,7 @@ int main() {
   expressions[148] = BinaryenReturn(the_module, expressions[147]);
   {
     BinaryenExpressionRef children[] = { expressions[141], expressions[143], expressions[146], expressions[148] };
-    expressions[149] = BinaryenBlock(the_module, "bb3", children, 4);
+    expressions[149] = BinaryenBlock(the_module, "bb3", children, 4, BinaryenUndefined());
   }
   relooperBlocks[3] = RelooperAddBlock(the_relooper, expressions[149]);
   RelooperAddBranch(relooperBlocks[0], relooperBlocks[1], expressions[0], expressions[0]);
@@ -325,7 +325,7 @@ int main() {
   RelooperAddBranch(relooperBlocks[1], relooperBlocks[4], expressions[0], expressions[0]);
   RelooperAddBranch(relooperBlocks[2], relooperBlocks[3], expressions[0], expressions[0]);
   {
-    BinaryenIndex paramTypes[] = { 1, 1 };
+    BinaryenType paramTypes[] = { 1, 1 };
     functionTypes[5] = BinaryenAddFunctionType(the_module, "rustfn-0-57", 1, paramTypes, 2);
   }
   expressions[153] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -340,7 +340,7 @@ int main() {
   }
   BinaryenAddExport(the_module, "main", "main");
   {
-    BinaryenIndex paramTypes[] = { 0 };
+    BinaryenType paramTypes[] = { 0 };
     functionTypes[6] = BinaryenAddFunctionType(the_module, "__wasm_start", 0, paramTypes, 0);
   }
   {
@@ -361,7 +361,7 @@ int main() {
   expressions[163] = BinaryenDrop(the_module, expressions[162]);
   {
     BinaryenExpressionRef children[] = { expressions[159], expressions[163] };
-    expressions[164] = BinaryenBlock(the_module, NULL, children, 2);
+    expressions[164] = BinaryenBlock(the_module, NULL, children, 2, BinaryenUndefined());
   }
   BinaryenAddExport(the_module, "__wasm_start", "rust_entry");
   {
@@ -401,7 +401,7 @@ int main() {
   expressions[193] = BinaryenStore(the_module, 4, 4, 0, expressions[191], expressions[184], 1);
   {
     BinaryenExpressionRef children[] = { expressions[166], expressions[168], expressions[170], expressions[172], expressions[178], expressions[190], expressions[192], expressions[193] };
-    expressions[194] = BinaryenBlock(the_module, "bb0", children, 8);
+    expressions[194] = BinaryenBlock(the_module, "bb0", children, 8, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[194]);
   expressions[195] = BinaryenGetLocal(the_module, 6, 1);
@@ -414,7 +414,7 @@ int main() {
   expressions[202] = BinaryenReturn(the_module, expressions[201]);
   {
     BinaryenExpressionRef children[] = { expressions[197], expressions[200], expressions[202] };
-    expressions[203] = BinaryenBlock(the_module, "bb1", children, 3);
+    expressions[203] = BinaryenBlock(the_module, "bb1", children, 3, BinaryenUndefined());
   }
   relooperBlocks[1] = RelooperAddBlock(the_relooper, expressions[203]);
   expressions[204] = BinaryenGetLocal(the_module, 6, 1);
@@ -424,7 +424,7 @@ int main() {
   relooperBlocks[2] = RelooperAddBlock(the_relooper, expressions[206]);
   RelooperAddBranch(relooperBlocks[0], relooperBlocks[2], expressions[0], expressions[0]);
   {
-    BinaryenIndex paramTypes[] = { 1, 1 };
+    BinaryenType paramTypes[] = { 1, 1 };
     functionTypes[7] = BinaryenAddFunctionType(the_module, "rustfn-0-13", 1, paramTypes, 2);
   }
   expressions[207] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -453,11 +453,11 @@ int main() {
   expressions[222] = BinaryenReturn(the_module, expressions[221]);
   {
     BinaryenExpressionRef children[] = { expressions[212], expressions[214], expressions[217], expressions[220], expressions[222] };
-    expressions[223] = BinaryenBlock(the_module, "bb0", children, 5);
+    expressions[223] = BinaryenBlock(the_module, "bb0", children, 5, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[223]);
   {
-    BinaryenIndex paramTypes[] = { 1 };
+    BinaryenType paramTypes[] = { 1 };
     functionTypes[8] = BinaryenAddFunctionType(the_module, "rustfn-0-22", 1, paramTypes, 1);
   }
   expressions[224] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -491,11 +491,11 @@ int main() {
   expressions[244] = BinaryenReturn(the_module, expressions[243]);
   {
     BinaryenExpressionRef children[] = { expressions[229], expressions[231], expressions[233], expressions[235], expressions[239], expressions[242], expressions[244] };
-    expressions[245] = BinaryenBlock(the_module, "bb0", children, 7);
+    expressions[245] = BinaryenBlock(the_module, "bb0", children, 7, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[245]);
   {
-    BinaryenIndex paramTypes[] = { 1, 1 };
+    BinaryenType paramTypes[] = { 1, 1 };
     functionTypes[9] = BinaryenAddFunctionType(the_module, "rustfn-0-33", 1, paramTypes, 2);
   }
   expressions[246] = BinaryenConst(the_module, BinaryenLiteralInt32(0));
@@ -529,11 +529,11 @@ int main() {
   expressions[266] = BinaryenReturn(the_module, expressions[265]);
   {
     BinaryenExpressionRef children[] = { expressions[251], expressions[253], expressions[255], expressions[257], expressions[261], expressions[264], expressions[266] };
-    expressions[267] = BinaryenBlock(the_module, "bb0", children, 7);
+    expressions[267] = BinaryenBlock(the_module, "bb0", children, 7, BinaryenUndefined());
   }
   relooperBlocks[0] = RelooperAddBlock(the_relooper, expressions[267]);
   {
-    BinaryenIndex paramTypes[] = { 1, 1 };
+    BinaryenType paramTypes[] = { 1, 1 };
     functionTypes[10] = BinaryenAddFunctionType(the_module, "rustfn-0-37", 1, paramTypes, 2);
   }
   expressions[268] = BinaryenConst(the_module, BinaryenLiteralInt32(0));