]> git.lizzy.rs Git - rust.git/commitdiff
Remove an overly pedantic and wrong assertion
authorOliver Schneider <github35764891676564198441@oli-obk.de>
Tue, 7 Aug 2018 16:37:50 +0000 (18:37 +0200)
committerOliver Schneider <github35764891676564198441@oli-obk.de>
Tue, 7 Aug 2018 16:37:50 +0000 (18:37 +0200)
src/librustc_mir/transform/const_prop.rs
src/test/ui/const-eval/issue-53157.rs [new file with mode: 0644]

index 05e51c5430d7fe5aafd0f4b9741974e09722dc70..5912eee758dbf185f300f7c5b45ee52b8075ef3d 100644 (file)
@@ -333,11 +333,6 @@ fn const_prop(
     ) -> Option<Const<'tcx>> {
         let span = source_info.span;
         match *rvalue {
-            // This branch exists for the sanity type check
-            Rvalue::Use(Operand::Constant(ref c)) => {
-                assert_eq!(c.ty, place_layout.ty);
-                self.eval_constant(c, source_info)
-            },
             Rvalue::Use(ref op) => {
                 self.eval_operand(op, source_info)
             },
diff --git a/src/test/ui/const-eval/issue-53157.rs b/src/test/ui/const-eval/issue-53157.rs
new file mode 100644 (file)
index 0000000..8beccd6
--- /dev/null
@@ -0,0 +1,23 @@
+// 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
+
+macro_rules! m {
+    () => {{
+        fn f(_: impl Sized) {}
+        f
+    }}
+}
+
+fn main() {
+    fn f() -> impl Sized {};
+    m!()(f());
+}
\ No newline at end of file