diff --git a/deps/crucible b/deps/crucible
index 9bf2333951..4d88a65b10 160000
--- a/deps/crucible
+++ b/deps/crucible
@@ -1 +1 @@
-Subproject commit 9bf23339511ae60b7b9b5c2d8fb948da9a94454d
+Subproject commit 4d88a65b10c3b6bcee9bdc3251611360346bdd35
diff --git a/deps/mir-json b/deps/mir-json
index da4ca7564b..99880b5973 160000
--- a/deps/mir-json
+++ b/deps/mir-json
@@ -1 +1 @@
-Subproject commit da4ca7564b70019b416058aa91f7f6e706445a13
+Subproject commit 99880b5973bc2de9ab82f63b2daeed69cf54e604
diff --git a/intTests/test1980/Makefile b/intTests/test1980/Makefile
new file mode 100644
index 0000000000..857fbf5dcf
--- /dev/null
+++ b/intTests/test1980/Makefile
@@ -0,0 +1,2 @@
+MIR_SRCS=test
+include ../support/mir-blobs.mk
diff --git a/intTests/test1980/test.linked-mir.json b/intTests/test1980/test.linked-mir.json
index 7c14f52b4b..b8ba206a62 100644
--- a/intTests/test1980/test.linked-mir.json
+++ b/intTests/test1980/test.linked-mir.json
@@ -1 +1 @@
-{"version":5,"fns":[{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::bf45af6907508207"},"kind":"Constant"},"kind":"Call","pos":"test.rs:2:25: 2:29"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:2:31: 2:31"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/9464768e::g","return_ty":"ty::u8","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::b180de67029c78f2"},"kind":"Constant"},"kind":"Call","pos":"test.rs:3:27: 3:31"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:3:33: 3:33"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/9464768e::h","return_ty":"ty::u16","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/9464768e::f::_inst2efc261c2cb07b6c[0]","return_ty":"ty::u8","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/9464768e::f::_inst3c788d91c468a39d[0]","return_ty":"ty::u16","spread_arg":null}],"adts":[],"statics":[],"vtables":[],"traits":[],"intrinsics":[{"inst":{"args":[],"def_id":"test/9464768e::g","kind":"Item"},"name":"test/9464768e::g"},{"inst":{"args":[],"def_id":"test/9464768e::h","kind":"Item"},"name":"test/9464768e::h"},{"inst":{"args":["ty::u8"],"def_id":"test/9464768e::f","kind":"Item"},"name":"test/9464768e::f::_inst2efc261c2cb07b6c[0]"},{"inst":{"args":["ty::u16"],"def_id":"test/9464768e::f","kind":"Item"},"name":"test/9464768e::f::_inst3c788d91c468a39d[0]"}],"tys":[{"layout":{"align":1,"size":1},"name":"ty::u8","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U8"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::bf45af6907508207","needs_drop":false,"ty":{"defid":"test/9464768e::f::_inst2efc261c2cb07b6c[0]","kind":"FnDef"}},{"layout":{"align":2,"size":2},"name":"ty::u16","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U16"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::b180de67029c78f2","needs_drop":false,"ty":{"defid":"test/9464768e::f::_inst3c788d91c468a39d[0]","kind":"FnDef"}}],"lang_items":[],"roots":["test/9464768e::g","test/9464768e::h"],"tests":[]}
\ No newline at end of file
+{"version":6,"fns":[{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::91a0dcb270812297"},"kind":"Constant"},"kind":"Call","pos":"test.rs:3:27: 3:31"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:3:33: 3:33"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/f90bd504::h","return_ty":"ty::u16","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[],"terminator":{"args":[{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Copy"}],"destination":[{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"bb1"],"func":{"data":{"rendered":{"kind":"zst"},"ty":"ty::FnDef::918d0e1293e4f0d2"},"kind":"Constant"},"kind":"Call","pos":"test.rs:2:25: 2:29"}},"blockid":"bb0"},{"block":{"data":[],"terminator":{"kind":"Return","pos":"test.rs:2:31: 2:31"}},"blockid":"bb1"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/f90bd504::g","return_ty":"ty::u8","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u16"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u16"}]},"name":"test/f90bd504::f::_inst3c788d91c468a39d[0]","return_ty":"ty::u16","spread_arg":null},{"abi":{"kind":"Rust"},"args":[{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}],"body":{"blocks":[{"block":{"data":[{"kind":"Assign","lhs":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}},"pos":"test.rs:1:26: 1:27","rhs":{"kind":"Use","usevar":{"data":{"data":[],"var":{"is_zst":false,"mut":{"kind":"Not"},"name":"_1","ty":"ty::u8"}},"kind":"Move"}}}],"terminator":{"kind":"Return","pos":"test.rs:1:29: 1:29"}},"blockid":"bb0"}],"vars":[{"is_zst":false,"mut":{"kind":"Mut"},"name":"_0","ty":"ty::u8"}]},"name":"test/f90bd504::f::_inst2efc261c2cb07b6c[0]","return_ty":"ty::u8","spread_arg":null}],"adts":[],"statics":[],"vtables":[],"traits":[],"intrinsics":[{"inst":{"args":[],"def_id":"test/f90bd504::h","kind":"Item"},"name":"test/f90bd504::h"},{"inst":{"args":[],"def_id":"test/f90bd504::g","kind":"Item"},"name":"test/f90bd504::g"},{"inst":{"args":["ty::u16"],"def_id":"test/f90bd504::f","kind":"Item"},"name":"test/f90bd504::f::_inst3c788d91c468a39d[0]"},{"inst":{"args":["ty::u8"],"def_id":"test/f90bd504::f","kind":"Item"},"name":"test/f90bd504::f::_inst2efc261c2cb07b6c[0]"}],"tys":[{"layout":{"align":2,"size":2},"name":"ty::u16","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U16"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::91a0dcb270812297","needs_drop":false,"ty":{"defid":"test/f90bd504::f::_inst3c788d91c468a39d[0]","kind":"FnDef"}},{"layout":{"align":1,"size":1},"name":"ty::u8","needs_drop":false,"ty":{"kind":"Uint","uintkind":{"kind":"U8"}}},{"layout":{"align":1,"size":0},"name":"ty::FnDef::918d0e1293e4f0d2","needs_drop":false,"ty":{"defid":"test/f90bd504::f::_inst2efc261c2cb07b6c[0]","kind":"FnDef"}}],"lang_items":[],"roots":["test/f90bd504::g","test/f90bd504::h"],"tests":[]}
\ No newline at end of file