Upgrade Binaryen to recent master

Author: chfast

cmake/ProjectBinaryen.cmake

@@ -29,6 +29,7 @@ set(binaryen_other_libraries
     ${binary_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}wasm${CMAKE_STATIC_LIBRARY_SUFFIX}
     ${binary_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}asmjs${CMAKE_STATIC_LIBRARY_SUFFIX}
     ${binary_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}passes${CMAKE_STATIC_LIBRARY_SUFFIX}
+    ${binary_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}wasm${CMAKE_STATIC_LIBRARY_SUFFIX}
     ${binary_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}cfg${CMAKE_STATIC_LIBRARY_SUFFIX}
     ${binary_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}ir${CMAKE_STATIC_LIBRARY_SUFFIX}
     ${binary_dir}/lib/${CMAKE_STATIC_LIBRARY_PREFIX}emscripten-optimizer${CMAKE_STATIC_LIBRARY_SUFFIX}
@@ -37,12 +38,12 @@ set(binaryen_other_libraries
 
 ExternalProject_Add(binaryen
     PREFIX ${prefix}
-    DOWNLOAD_NAME binaryen-1.38.9.tar.gz
+    DOWNLOAD_NAME binaryen-45714b5fc6cf14c112bc4f188aca427464ab69d8.tar.gz
     DOWNLOAD_DIR ${prefix}/downloads
     SOURCE_DIR ${source_dir}
     BINARY_DIR ${binary_dir}
-    URL https://github.com/WebAssembly/binaryen/archive/1.38.9.tar.gz
-    URL_HASH SHA256=f8c6d4deb83dba8709c4df9f7983080ec0f9412e88899767ed2815b911ce1ebd
+    URL https://github.com/WebAssembly/binaryen/archive/45714b5fc6cf14c112bc4f188aca427464ab69d8.tar.gz
+    URL_HASH SHA256=4b930c751b269ea989f503a624d1361f31d3c7366d4c6f4c005c7d50399e9a1f
     CMAKE_ARGS
     -DCMAKE_INSTALL_PREFIX=<INSTALL_DIR>
     -DCMAKE_INSTALL_LIBDIR=lib
@@ -63,7 +64,6 @@ set_target_properties(
     IMPORTED_LOCATION_RELEASE ${binaryen_library}
     INTERFACE_INCLUDE_DIRECTORIES ${binaryen_include_dir}
     INTERFACE_LINK_LIBRARIES "${binaryen_other_libraries}"
-
 )
 
 add_dependencies(binaryen::binaryen binaryen)

src/binaryen.cpp

@@ -49,9 +49,9 @@ class BinaryenEthereumInterface : public wasm::ShellExternalInterface, EthereumI
   { }
 
 protected:
-  wasm::Literal callImport(wasm::Import *import, wasm::LiteralList& arguments) override;
+  wasm::Literal callImport(wasm::Function* import, wasm::LiteralList& arguments) override;
 #if HERA_DEBUGGING
-  wasm::Literal callDebugImport(wasm::Import *import, wasm::LiteralList& arguments);
+  wasm::Literal callDebugImport(wasm::Function* import, wasm::LiteralList& arguments);
 #endif
 
   void importGlobals(map<wasm::Name, wasm::Literal>& globals, wasm::Module& wasm) override;
@@ -73,7 +73,7 @@ class BinaryenEthereumInterface : public wasm::ShellExternalInterface, EthereumI
   }
 
 #if HERA_DEBUGGING
-  wasm::Literal BinaryenEthereumInterface::callDebugImport(wasm::Import *import, wasm::LiteralList& arguments) {
+  wasm::Literal BinaryenEthereumInterface::callDebugImport(wasm::Function *import, wasm::LiteralList& arguments) {
     heraAssert(import->module == wasm::Name("debug"), "Import namespace error.");
 
     if (import->base == wasm::Name("print32")) {
@@ -134,7 +134,7 @@ class BinaryenEthereumInterface : public wasm::ShellExternalInterface, EthereumI
   }
 #endif
 
-  wasm::Literal BinaryenEthereumInterface::callImport(wasm::Import *import, wasm::LiteralList& arguments) {
+  wasm::Literal BinaryenEthereumInterface::callImport(wasm::Function* import, wasm::LiteralList& arguments) {
 #if HERA_DEBUGGING
     if (import->module == wasm::Name("debug"))
       // Reroute to debug namespace
@@ -622,7 +622,7 @@ void BinaryenEngine::verifyContract(wasm::Module & module)
     { wasm::Name("selfDestruct"), createFunctionType({ wasm::Type::i32 }, wasm::Type::none) }
   };
 
-  for (auto const& import: module.imports) {
+  for (auto const& import: module.functions) {
     ensureCondition(
       import->module == wasm::Name("ethereum")
 #if HERA_DEBUGGING
@@ -644,7 +644,7 @@ void BinaryenEngine::verifyContract(wasm::Module & module)
       "Importing invalid EEI method."
     );
 
-    wasm::FunctionType* function_type = module.getFunctionTypeOrNull(import->functionType);
+    wasm::FunctionType* function_type = module.getFunctionTypeOrNull(import->type);
     ensureCondition(
       function_type,
       ContractValidationFailure,

src/shell-interface.h

@@ -116,7 +116,7 @@ struct ShellExternalInterface : ModuleInstance::ExternalInterface {
     trap("No globals supported.");
   }
 
-  Literal callImport(Import *import, LiteralList& arguments) override {
+  Literal callImport(Function* import, LiteralList& arguments) override {
     (void)import;
     (void)arguments;
     trap("No imports supported.");