Update wasmonkey (#237)

We will eventually get rid of it, but meanwhile, this updates it to use the current versions of parity-wasm and goblin.

Author: jedisct1

Cargo.lock

@@ -1,21 +1,22 @@
 [package]
 name = "wasmonkey"
-version = "0.1.4"
-authors = ["Frank Denis <[email protected]>"]
+version = "0.1.7"
+authors = ["Lucet team <[email protected]>"]
 description = "Patch a WASM object file to replace a set of exported functions with imported functions from another library"
-license = "ISC"
-homepage = "https://github.com/jedisct1/wasmonkey"
-repository = "https://github.com/jedisct1/wasmonkey"
+license = "Apache-2.0 WITH LLVM-exception"
+homepage = "https://github.com/fastly/lucet"
+repository = "https://github.com/fastly/lucet"
 categories = ["wasm"]
+edition = "2018"
 
 [dependencies]
-clap = "2.32"
+clap = "2.33"
 failure = "0.1"
-goblin = "0.0.21"
-lazy_static = "1.2"
-parity-wasm = "0.35"
+goblin = "0.0.22"
+lazy_static = "1.3"
+parity-wasm = "0.38"
 serde = "1.0"
 serde_derive = "1.0"
 serde_json = "1.0"
-siphasher = "0.2"
+siphasher = "0.3"
 xfailure = "0.1"

lucet-builtins/wasmonkey/Cargo.toml

@@ -1,6 +1,6 @@
+use crate::{PatcherConfig, WError};
 use clap::{App, Arg};
 use std::path::PathBuf;
-use {PatcherConfig, WError};
 
 #[derive(Default, Clone, Debug)]
 pub struct Config {

lucet-builtins/wasmonkey/src/bin/config/mod.rs

@@ -1,10 +1,6 @@
-extern crate clap;
-extern crate failure;
-extern crate wasmonkey;
-
 mod config;
 
-use config::*;
+use crate::config::*;
 use wasmonkey::*;
 
 fn main() -> Result<(), WError> {

lucet-builtins/wasmonkey/src/bin/wasmonkey.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use parity_wasm::elements::{
     CodeSection, ElementSection, ExportSection, FuncBody, Instruction, Instructions, Internal,
     Module,
@@ -12,8 +12,8 @@ fn shift_function_ids_in_code_section(
     for code_body in code_bodies.iter_mut() {
         let opcodes = code_body.code_mut().elements_mut();
         for opcode in opcodes.iter_mut() {
-            if let Instruction::Call(ref mut function_id) = opcode {
-                *function_id = *function_id + shift
+            if let Instruction::Call(function_id) = *opcode {
+                *opcode = Instruction::Call(function_id + shift)
             }
         }
     }
@@ -23,8 +23,8 @@ fn shift_function_ids_in_code_section(
 fn shift_function_ids_in_exports_section(export_section: &mut ExportSection, shift: u32) {
     for entry in export_section.entries_mut() {
         let internal = entry.internal_mut();
-        if let Internal::Function(ref mut function_id) = internal {
-            *function_id = *function_id + shift
+        if let Internal::Function(function_id) = *internal {
+            *internal = Internal::Function(function_id + shift)
         }
     }
 }
@@ -53,9 +53,9 @@ fn replace_function_id_in_code_section(code_section: &mut CodeSection, before: u
     for code_body in code_bodies.iter_mut() {
         let opcodes = code_body.code_mut().elements_mut();
         for opcode in opcodes.iter_mut() {
-            match opcode {
-                Instruction::Call(ref mut function_id) if *function_id == before => {
-                    *function_id = after
+            match *opcode {
+                Instruction::Call(function_id) if function_id == before => {
+                    *opcode = Instruction::Call(after)
                 }
                 _ => {}
             }

lucet-builtins/wasmonkey/src/functions_ids.rs

@@ -1,15 +1,15 @@
-use errors::*;
-use parity_wasm::elements::{FunctionNameSection, IndexMap};
+use crate::errors::*;
+use parity_wasm::elements::{FunctionNameSubsection, IndexMap};
 
 pub fn prepend_function_name(
-    function_names_section: &mut FunctionNameSection,
+    function_names_subsection: &mut FunctionNameSubsection,
     name: String,
 ) -> Result<(), WError> {
-    let mut map_new = IndexMap::with_capacity(function_names_section.names().len() + 1 as usize);
-    for (idx, name) in function_names_section.names() {
+    let mut map_new = IndexMap::with_capacity(function_names_subsection.names().len() + 1 as usize);
+    for (idx, name) in function_names_subsection.names() {
         map_new.insert(idx + 1, name.clone());
     }
     map_new.insert(0, name);
-    *function_names_section.names_mut() = map_new;
+    *function_names_subsection.names_mut() = map_new;
     Ok(())
 }

lucet-builtins/wasmonkey/src/functions_names.rs

@@ -1,13 +1,12 @@
-extern crate clap;
 #[macro_use]
 extern crate failure;
-extern crate goblin;
+
 #[cfg_attr(test, macro_use)]
 extern crate lazy_static;
-extern crate parity_wasm;
+
 #[macro_use]
 extern crate serde_derive;
-extern crate serde_json;
+
 #[cfg(test)]
 extern crate siphasher;
 #[macro_use]
@@ -24,5 +23,5 @@ mod symbols;
 #[cfg(test)]
 mod tests;
 
-pub use errors::*;
-pub use patcher::*;
+pub use crate::errors::*;
+pub use crate::patcher::*;

lucet-builtins/wasmonkey/src/lib.rs

@@ -1,4 +1,4 @@
-use errors::*;
+use crate::errors::*;
 use serde_json;
 use std::collections::HashMap;
 use std::fs::File;

lucet-builtins/wasmonkey/src/map.rs

@@ -1,15 +1,15 @@
-use errors::*;
-use functions_ids::*;
-use functions_names::*;
-use map::*;
+use crate::errors::*;
+use crate::functions_ids::*;
+use crate::functions_names::*;
+use crate::map::*;
+use crate::sections::*;
+use crate::symbols::{self, ExtractedSymbols};
 use parity_wasm;
 use parity_wasm::elements::{
-    self, External, ImportEntry, ImportSection, Internal, Module, NameSection, Section,
+    self, External, ImportEntry, ImportSection, Internal, Module, Section,
 };
-use sections::*;
 use std::collections::HashMap;
 use std::path::{Path, PathBuf};
-use symbols::{self, ExtractedSymbols};
 
 pub const BUILTIN_PREFIX: &str = "builtin_";
 
@@ -176,11 +176,11 @@ fn prepend_builtin_to_names_section(module: &mut Module, builtin: &Builtin) -> R
     let names_section = module
         .names_section_mut()
         .expect("Names section not present");
-    let function_names_section = match names_section {
-        NameSection::Function(function_names_section) => function_names_section,
+    let function_names_subsection = match names_section.functions_mut() {
+        Some(function_names_subsection) => function_names_subsection,
         _ => xbail!(WError::InternalError("Unexpected names section")),
     };
-    prepend_function_name(function_names_section, import_name)?;
+    prepend_function_name(function_names_subsection, import_name)?;
     Ok(())
 }
 

lucet-builtins/wasmonkey/src/patcher.rs

@@ -1,8 +1,8 @@
-use errors::*;
+use crate::errors::*;
+use crate::patcher::BUILTIN_PREFIX;
 use goblin::elf::Elf;
 use goblin::mach::{self, Mach, MachO};
 use goblin::Object;
-use patcher::BUILTIN_PREFIX;
 use std::fs::File;
 use std::io::Read;
 use std::path::Path;
@@ -36,7 +36,7 @@ impl ExtractedSymbols {
 
     pub fn merge_additional(mut self, additional_names: &[String]) -> Self {
         let mut additional_symbols: Vec<_> = additional_names
-            .into_iter()
+            .iter()
             .map(|name| ExtractedSymbol {
                 name: name.to_string(),
             })
@@ -47,7 +47,7 @@ impl ExtractedSymbols {
     }
 }
 
-fn parse_elf(elf: &Elf) -> Result<ExtractedSymbols, WError> {
+fn parse_elf(elf: &Elf<'_>) -> Result<ExtractedSymbols, WError> {
     let mut symbols = vec![];
 
     for symbol in elf
@@ -67,7 +67,7 @@ fn parse_elf(elf: &Elf) -> Result<ExtractedSymbols, WError> {
     Ok(symbols.into())
 }
 
-fn parse_macho(macho: &MachO) -> Result<ExtractedSymbols, WError> {
+fn parse_macho(macho: &MachO<'_>) -> Result<ExtractedSymbols, WError> {
     let mut symbols = vec![];
 
     // Start by finding the boundaries of the text section