]> git.lizzy.rs Git - rust.git/commitdiff
Fix an ICE when attempting to transmute an uninhabited type
authorvarkor <github@varkor.com>
Wed, 16 May 2018 20:26:50 +0000 (21:26 +0100)
committervarkor <github@varkor.com>
Thu, 17 May 2018 17:15:24 +0000 (18:15 +0100)
src/librustc_codegen_llvm/mir/block.rs
src/test/compile-fail/never_transmute_never.rs [new file with mode: 0644]

index 556baeba39e0ad2b79c3e81b43876bd466da3c6a..bc5819791fa371041b80673490a6b4ca885693be 100644 (file)
@@ -428,9 +428,19 @@ fn codegen_terminator(&mut self,
                 let intrinsic = intrinsic.as_ref().map(|s| &s[..]);
 
                 if intrinsic == Some("transmute") {
-                    let &(ref dest, target) = destination.as_ref().unwrap();
-                    self.codegen_transmute(&bx, &args[0], dest);
-                    funclet_br(self, bx, target);
+                    if let Some(destination_ref) = destination.as_ref() {
+                        let &(ref dest, target) = destination_ref;
+                        self.trans_transmute(&bx, &args[0], dest);
+                        funclet_br(self, bx, target);
+                    } else {
+                        // If we are trying to transmute to an uninhabited type,
+                        // it is likely there is no allotted destination. In fact,
+                        // transmuting to an uninhabited type is UB, which means
+                        // we can do what we like. Here, we declare that transmuting
+                        // into an uninhabited type is impossible, so anything following
+                        // it must be unreachable.
+                        bx.unreachable();
+                    }
                     return;
                 }
 
diff --git a/src/test/compile-fail/never_transmute_never.rs b/src/test/compile-fail/never_transmute_never.rs
new file mode 100644 (file)
index 0000000..cbcc47f
--- /dev/null
@@ -0,0 +1,33 @@
+// Copyright 2018 The Rust Project Developers. See the COPYRIGHT
+// file at the top-level directory of this distribution and at
+// http://rust-lang.org/COPYRIGHT.
+//
+// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
+// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
+// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
+// option. This file may not be copied, modified, or distributed
+// except according to those terms.
+
+// compile-pass
+
+#![crate_type="lib"]
+
+#![feature(never_type)]
+#![allow(dead_code)]
+#![allow(unreachable_code)]
+#![allow(unused_variables)]
+
+struct Foo;
+
+pub fn f(x: !) -> ! {
+    x
+}
+
+pub fn ub() {
+    // This is completely undefined behaviour,
+    // but we still want to make sure it compiles.
+    let x: ! = unsafe {
+        std::mem::transmute::<Foo, !>(Foo)
+    };
+    f(x)
+}