From c74ff320eef258ad1bcd5a4c4b7f8294e4f9cb30 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Mon, 21 Aug 2017 22:09:50 -0700
Subject: [PATCH] More merge conflicts

---
 src/librustc_mir/shim.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/librustc_mir/shim.rs b/src/librustc_mir/shim.rs
index 039651b7e937..1e0858d68645 100644
--- a/src/librustc_mir/shim.rs
+++ b/src/librustc_mir/shim.rs
@@ -335,6 +335,7 @@ impl<'a, 'tcx> CloneShimBuilder<'a, 'tcx> {
             ),
             IndexVec::new(),
             self.sig.output(),
+            None,
             self.local_decls,
             self.sig.inputs().len(),
             vec![],