From afcbc2e90f7bdc2f2853a15a1c30079517b5addb Mon Sep 17 00:00:00 2001 From: Oliver Schneider Date: Tue, 7 Aug 2018 18:37:50 +0200 Subject: [PATCH] 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 05e51c5430d7..5912eee758db 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> { 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 000000000000..8beccd6c80b6 --- /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 or the MIT license +// , 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