From c7bd842ee39ce9d13f313087791a5d706ed6fdf0 Mon Sep 17 00:00:00 2001
From: Dan Gohman <sunfish@mozilla.com>
Date: Tue, 12 Sep 2017 16:25:15 -0700
Subject: [PATCH] Refactor code to use Context::verify instead of doing it
 manually.

---
 cranelift/src/wasm.rs | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/cranelift/src/wasm.rs b/cranelift/src/wasm.rs
index 4f48ae6d70..6b22d66e31 100644
--- a/cranelift/src/wasm.rs
+++ b/cranelift/src/wasm.rs
@@ -155,14 +155,17 @@ fn handle_module(
         for func in &translation.functions {
             let mut context = Context::new();
             context.func = func.clone();
-            verifier::verify_context(&context.func, &context.cfg, &context.domtree, None)
-                .map_err(|err| pretty_verifier_error(&context.func, None, err))?;
+            context.verify(None).map_err(|err| {
+                pretty_verifier_error(&context.func, None, err)
+            })?;
             context.licm();
-            verifier::verify_context(&context.func, &context.cfg, &context.domtree, None)
-                .map_err(|err| pretty_verifier_error(&context.func, None, err))?;
+            context.verify(None).map_err(|err| {
+                pretty_verifier_error(&context.func, None, err)
+            })?;
             context.simple_gvn();
-            verifier::verify_context(&context.func, &context.cfg, &context.domtree, None)
-                .map_err(|err| pretty_verifier_error(&context.func, None, err))?;
+            context.verify(None).map_err(|err| {
+                pretty_verifier_error(&context.func, None, err)
+            })?;
         }
         terminal.fg(term::color::GREEN).unwrap();
         vprintln!(flag_verbose, " ok");