---

yaml
---
r: 277422
b: refs/heads/try
c: b5d7783
h: refs/heads/master

Author: Aatch

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: 3bcee269b50def69d73bd588b1619ec6a4756662
+refs/heads/try: b5d7783546f938c7c2903b4d5143ff8e8e612674
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/src/librustc_trans/builder.rs

@@ -165,8 +165,7 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                   args: &[ValueRef],
                   then: BasicBlockRef,
                   catch: BasicBlockRef,
-                  bundle: Option<&OperandBundleDef>)
-                  -> ValueRef {
+                  bundle: Option<&OperandBundleDef>) -> ValueRef {
         self.count_insn("invoke");
 
         debug!("Invoke {:?} with args ({})",
@@ -176,6 +175,31 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                    .collect::<Vec<String>>()
                    .join(", "));
 
+        if cfg!(debug_assertions) {
+            let mut fn_ty = val_ty(llfn);
+            // Strip off pointers
+            while fn_ty.kind() == llvm::TypeKind::Pointer {
+                fn_ty = fn_ty.element_type();
+            }
+
+            assert!(fn_ty.kind() == llvm::TypeKind::Function,
+                    "builder::invoke not passed a function");
+
+            let param_tys = fn_ty.func_params();
+
+            let iter = param_tys.into_iter()
+                .zip(args.iter().map(|&v| val_ty(v)));
+            for (i, (expected_ty, actual_ty)) in iter.enumerate() {
+                if expected_ty != actual_ty {
+                    bug!("Type mismatch in invoke of {:?}. \
+                      Expected {:?} for param {}, got {:?}",
+                     Value(llfn),
+                     expected_ty, i, actual_ty);
+
+                }
+            }
+        }
+
         let bundle = bundle.as_ref().map(|b| b.raw()).unwrap_or(0 as *mut _);
 
         unsafe {
@@ -856,26 +880,28 @@ impl<'a, 'tcx> Builder<'a, 'tcx> {
                    .collect::<Vec<String>>()
                    .join(", "));
 
-        let mut fn_ty = val_ty(llfn);
-        // Strip off pointers
-        while fn_ty.kind() == llvm::TypeKind::Pointer {
-            fn_ty = fn_ty.element_type();
-        }
+        if cfg!(debug_assertions) {
+            let mut fn_ty = val_ty(llfn);
+            // Strip off pointers
+            while fn_ty.kind() == llvm::TypeKind::Pointer {
+                fn_ty = fn_ty.element_type();
+            }
 
-        assert!(fn_ty.kind() == llvm::TypeKind::Function,
-                "builder::call not passed a function");
+            assert!(fn_ty.kind() == llvm::TypeKind::Function,
+                    "builder::call not passed a function");
 
-        let param_tys = fn_ty.func_params();
+            let param_tys = fn_ty.func_params();
 
-        let iter = param_tys.into_iter()
-            .zip(args.iter().map(|&v| val_ty(v)));
-        for (i, (expected_ty, actual_ty)) in iter.enumerate() {
-            if expected_ty != actual_ty {
-                bug!("Type mismatch in function call of {:?}. \
+            let iter = param_tys.into_iter()
+                .zip(args.iter().map(|&v| val_ty(v)));
+            for (i, (expected_ty, actual_ty)) in iter.enumerate() {
+                if expected_ty != actual_ty {
+                    bug!("Type mismatch in function call of {:?}. \
                       Expected {:?} for param {}, got {:?}",
                      Value(llfn),
                      expected_ty, i, actual_ty);
 
+                }
             }
         }