From d2c1d92e2b6737ad4f74ffe7de4d29a49f7d0568 Mon Sep 17 00:00:00 2001 From: Sergey Pepyakin Date: Thu, 9 Nov 2017 17:36:13 +0300 Subject: [PATCH] Don't externalize setTempRet0 It is not longer needed, as we stopped to do legalization for JS FFI. --- build/src/main.rs | 8 ++++---- src/lib.rs | 1 - src/pack.rs | 5 ++--- 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/build/src/main.rs b/build/src/main.rs index 3f6adb6..b51a4be 100644 --- a/build/src/main.rs +++ b/build/src/main.rs @@ -12,7 +12,7 @@ use std::path::PathBuf; use clap::{App, Arg}; use parity_wasm::elements; -use wasm_utils::{CREATE_SYMBOL, CALL_SYMBOL, SET_TEMP_RET_SYMBOL}; +use wasm_utils::{CREATE_SYMBOL, CALL_SYMBOL}; #[derive(Debug)] pub enum Error { @@ -113,7 +113,7 @@ fn main() { let mut ctor_module = module.clone(); if !matches.is_present("skip_optimization") { - wasm_utils::optimize(&mut module, vec![CALL_SYMBOL, SET_TEMP_RET_SYMBOL]).expect("Optimizer to finish without errors"); + wasm_utils::optimize(&mut module, vec![CALL_SYMBOL]).expect("Optimizer to finish without errors"); } let raw_module = parity_wasm::serialize(module).expect("Failed to serialize module"); @@ -123,7 +123,7 @@ fn main() { // Otherwise it will just save an optimised raw_module if has_ctor(&ctor_module) { if !matches.is_present("skip_optimization") { - wasm_utils::optimize(&mut ctor_module, vec![CREATE_SYMBOL, SET_TEMP_RET_SYMBOL]).expect("Optimizer to finish without errors"); + wasm_utils::optimize(&mut ctor_module, vec![CREATE_SYMBOL]).expect("Optimizer to finish without errors"); } wasm_utils::pack_instance(raw_module, &mut ctor_module); parity_wasm::serialize_to_file(&path, ctor_module).expect("Failed to serialize to file"); @@ -165,4 +165,4 @@ mod tests { ) } -} \ No newline at end of file +} diff --git a/src/lib.rs b/src/lib.rs index 96ab101..fb32da2 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -6,7 +6,6 @@ extern crate byteorder; pub static CREATE_SYMBOL: &'static str = "_create"; pub static CALL_SYMBOL: &'static str = "_call"; -pub static SET_TEMP_RET_SYMBOL: &'static str = "setTempRet0"; pub mod rules; diff --git a/src/pack.rs b/src/pack.rs index 03631b7..e0096ed 100644 --- a/src/pack.rs +++ b/src/pack.rs @@ -103,7 +103,6 @@ mod test { use parity_wasm::ModuleInstanceInterface; use super::*; use super::super::optimize; - use super::super::SET_TEMP_RET_SYMBOL; use byteorder::{ByteOrder, LittleEndian}; #[test] @@ -150,8 +149,8 @@ mod test { .build(); let mut ctor_module = module.clone(); - optimize(&mut module, vec![CALL_SYMBOL, SET_TEMP_RET_SYMBOL]).expect("Optimizer to finish without errors"); - optimize(&mut ctor_module, vec![CREATE_SYMBOL, SET_TEMP_RET_SYMBOL]).expect("Optimizer to finish without errors"); + optimize(&mut module, vec![CALL_SYMBOL]).expect("Optimizer to finish without errors"); + optimize(&mut ctor_module, vec![CREATE_SYMBOL]).expect("Optimizer to finish without errors"); let raw_module = parity_wasm::serialize(module).unwrap(); pack_instance(raw_module.clone(), &mut ctor_module);