Fix error not reported if at least one other error expected. (#485)

* fix error not reported if at least one other error expected.

* Fixed unused extern crate error if wasm feature is not enabled.

* No longer reporting deref cycles multiple times.

* Fix filetest type_check.clif.

* Switched comparison order for perf.

* Fixed isa/riscv/verify-encoding.clif filetest.

cranelift/filetests/isa/riscv/verify-encoding.clif

@@ -7,7 +7,7 @@ function %RV32I(i32 link [%x1]) -> i32 link [%x1] {
 ebb0(v9999: i32):
     ; iconst.i32 needs legalizing, so it should throw a
     [R#0,-]         v1 = iconst.i32 0xf0f0f0f0f0 ; error: Instruction failed to re-encode
-    return v9999
+    [Iret#19]       return v9999
 }
 
 function %RV32I(i32 link [%x1]) -> i32 link [%x1] {
@@ -17,5 +17,5 @@ ebb0(v9999: i32):
     v1 = iconst.i32 1
     v2 = iconst.i32 2
     [R#0,-]         v3 = iadd v1, v2 ; error: encoding R#00 should be R#0c
-    return v9999
+    [Iret#19]       return v9999
 }

cranelift/filetests/verifier/type_check.clif

@@ -82,6 +82,7 @@ function %jump_args() {
         v0 = iconst.i16 10
         v3 = iconst.i64 20
         jump ebb1(v0, v3) ; error: arg 0 (v0) has type i16, expected i64
+                          ; error: arg 1 (v3) has type i64, expected i16
     ebb1(v10: i64, v11: i16):
         return
 }
@@ -91,6 +92,7 @@ function %jump_args2() {
         v0 = iconst.i16 10
         v3 = iconst.i64 20
         brz v0, ebb1(v0, v3) ; error: arg 0 (v0) has type i16, expected i64
+                             ; error: arg 1 (v3) has type i64, expected i16
         jump ebb1(v3, v0)
     ebb1(v10: i64, v11: i16):
         return

cranelift/src/clif-util.rs

@@ -15,13 +15,13 @@ extern crate cfg_if;
 extern crate capstone;
 extern crate clap;
 extern crate cranelift_codegen;
-extern crate cranelift_entity;
 extern crate cranelift_filetests;
 extern crate cranelift_reader;
 extern crate pretty_env_logger;
 
 cfg_if! {
     if #[cfg(feature = "wasm")] {
+        extern crate cranelift_entity;
         extern crate cranelift_wasm;
         extern crate term;
         extern crate wabt;