More merge conflicts

2017-08-21 22:09:50 -07:00 · 2017-08-21 22:09:50 -07:00 · c74ff320ee
commit c74ff320ee
parent 04c66c30a7
1 changed files with 1 additions and 0 deletions
--- 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![],