From afcbc2e90f7bdc2f2853a15a1c30079517b5addb Mon Sep 17 00:00:00 2001
From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Tue, 7 Aug 2018 18:37:50 +0200
Subject: [PATCH 1/2] Remove an overly pedantic and wrong assertion

---
 src/librustc_mir/transform/const_prop.rs |  5 -----
 src/test/ui/const-eval/issue-53157.rs    | 23 +++++++++++++++++++++++
 2 files changed, 23 insertions(+), 5 deletions(-)
 create mode 100644 src/test/ui/const-eval/issue-53157.rs

diff --git a/src/librustc_mir/transform/const_prop.rs b/src/librustc_mir/transform/const_prop.rs
index 05e51c5430d7f..5912eee758dbf 100644
--- a/src/librustc_mir/transform/const_prop.rs
+++ b/src/librustc_mir/transform/const_prop.rs
@@ -333,11 +333,6 @@ impl<'b, 'a, 'tcx:'b> ConstPropagator<'b, 'a, 'tcx> {
     ) -> 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
index 0000000000000..8beccd6c80b68
--- /dev/null
+++ b/src/test/ui/const-eval/issue-53157.rs
@@ -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

From 8935f99833a3a89604ee7d6e584748ec41cb30ff Mon Sep 17 00:00:00 2001
From: Oliver Schneider <github35764891676564198441@oli-obk.de>
Date: Tue, 7 Aug 2018 19:51:38 +0200
Subject: [PATCH 2/2] Fix tidy

---
 src/test/ui/const-eval/issue-53157.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/ui/const-eval/issue-53157.rs b/src/test/ui/const-eval/issue-53157.rs
index 8beccd6c80b68..900847767e1ba 100644
--- a/src/test/ui/const-eval/issue-53157.rs
+++ b/src/test/ui/const-eval/issue-53157.rs
@@ -20,4 +20,4 @@ macro_rules! m {
 fn main() {
     fn f() -> impl Sized {};
     m!()(f());
-}
\ No newline at end of file
+}