Update to latest versions of term, capstone, wabt, goblin, wasmparser.

cranelift/Cargo.toml

@@ -35,9 +35,9 @@ cranelift = { path = "cranelift-umbrella", version = "0.38.0" }
 filecheck = "0.4.0"
 clap = "2.32.0"
 serde = "1.0.8"
-term = "0.5.1"
+term = "0.6.1"
-capstone = { version = "0.5.0", optional = true }
+capstone = { version = "0.6.0", optional = true }
-wabt = { version = "0.7.0", optional = true }
+wabt = { version = "0.9.1", optional = true }
 target-lexicon = "0.4.0"
 pretty_env_logger = "0.3.0"
 file-per-thread-logger = "0.1.2"

cranelift/faerie/Cargo.toml

@@ -13,7 +13,7 @@ edition = "2018"
 cranelift-codegen = { path = "../cranelift-codegen", version = "0.38.0" }
 cranelift-module = { path = "../cranelift-module", version = "0.38.0" }
 faerie = "0.10.0"
-goblin = "0.0.22"
+goblin = "0.0.24"
 failure = "0.1.2"
 target-lexicon = "0.4.0"
 

cranelift/filetests/src/test_safepoint.rs

@@ -6,7 +6,7 @@ use std::borrow::Cow;
 
 struct TestSafepoint;
 
-pub fn subtest(parsed: &TestCommand) -> SubtestResult<Box<SubTest>> {
+pub fn subtest(parsed: &TestCommand) -> SubtestResult<Box<dyn SubTest>> {
     assert_eq!(parsed.command, "safepoint");
     if !parsed.options.is_empty() {
         Err(format!("No options allowed on {}", parsed))

cranelift/src/bugpoint.rs

@@ -596,7 +596,7 @@ fn resolve_aliases(func: &mut Function) {
 }
 
 fn reduce(
-    isa: &TargetIsa,
+    isa: &dyn TargetIsa,
     mut func: Function,
     verbose: bool,
 ) -> Result<(Function, String), String> {
@@ -658,10 +658,10 @@ struct CrashCheckContext<'a> {
     context: Context,
 
     /// The target isa to compile for.
-    isa: &'a TargetIsa,
+    isa: &'a dyn TargetIsa,
 }
 
-fn get_panic_string(panic: Box<std::any::Any>) -> String {
+fn get_panic_string(panic: Box<dyn std::any::Any>) -> String {
     let panic = match panic.downcast::<&'static str>() {
         Ok(panic_msg) => panic_msg.to_owned(),
         Err(panic) => panic,
@@ -681,7 +681,7 @@ enum CheckResult {
 }
 
 impl<'a> CrashCheckContext<'a> {
-    fn new(isa: &'a TargetIsa) -> Self {
+    fn new(isa: &'a dyn TargetIsa) -> Self {
         CrashCheckContext {
             context: Context::new(),
             isa,

cranelift/src/disasm.rs

@@ -140,7 +140,7 @@ cfg_if! {
         }
 
         pub fn print_disassembly(isa: &dyn TargetIsa, mem: &[u8]) -> Result<(), String> {
-            let mut cs = get_disassembler(isa)?;
+            let cs = get_disassembler(isa)?;
 
             println!("\nDisassembly of {} bytes:", mem.len());
             let insns = cs.disasm_all(&mem, 0x0).unwrap();

cranelift/wasm/Cargo.toml

@@ -11,7 +11,7 @@ keywords = ["webassembly", "wasm"]
 edition = "2018"
 
 [dependencies]
-wasmparser = { version = "0.32.1", default-features = false }
+wasmparser = { version = "0.36.0", default-features = false }
 cranelift-codegen = { path = "../cranelift-codegen", version = "0.38.0", default-features = false }
 cranelift-entity = { path = "../cranelift-entity", version = "0.38.0", default-features = false }
 cranelift-frontend = { path = "../cranelift-frontend", version = "0.38.0", default-features = false }
@@ -22,7 +22,7 @@ log = { version = "0.4.6", default-features = false }
 serde = { version = "1.0.94", features = ["derive"], optional = true }
 
 [dev-dependencies]
-wabt = "0.7.0"
+wabt = "0.9.1"
 target-lexicon = "0.4.0"
 
 [features]

cranelift/wasm/src/code_translator.rs

@@ -905,7 +905,8 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
         | Operator::I32AtomicRmw16UCmpxchg { .. }
         | Operator::I64AtomicRmw8UCmpxchg { .. }
         | Operator::I64AtomicRmw16UCmpxchg { .. }
-        | Operator::I64AtomicRmw32UCmpxchg { .. } => {
+        | Operator::I64AtomicRmw32UCmpxchg { .. }
+        | Operator::Fence { .. } => {
             wasm_unsupported!("proposed thread operator {:?}", op);
         }
         Operator::MemoryInit { .. }
@@ -1060,9 +1061,12 @@ pub fn translate_operator<FE: FuncEnvironment + ?Sized>(
         | Operator::F32x4ConvertSI32x4
         | Operator::F32x4ConvertUI32x4
         | Operator::F64x2ConvertSI64x2
-        | Operator::F64x2ConvertUI64x2
+        | Operator::F64x2ConvertUI64x2 { .. }
-        | Operator::V8x16Shuffle1
+        | Operator::V8x16Swizzle
-        | Operator::V8x16Shuffle2Imm { .. } => {
+        | Operator::I8x16LoadSplat { .. }
+        | Operator::I16x8LoadSplat { .. }
+        | Operator::I32x4LoadSplat { .. }
+        | Operator::I64x2LoadSplat { .. } => {
             wasm_unsupported!("proposed SIMD operator {:?}", op);
         }
     };