Auto merge of #53163 - oli-obk:const_prop_ice, r=nikomatsakis
Remove an overly pedantic and wrong assertion fixes #53157 fixes #53087
This commit is contained in:
commit
62e4e08f4c
@ -333,11 +333,6 @@ impl<'b, 'a, 'tcx:'b> ConstPropagator<'b, 'a, 'tcx> {
|
|||||||
) -> Option<Const<'tcx>> {
|
) -> Option<Const<'tcx>> {
|
||||||
let span = source_info.span;
|
let span = source_info.span;
|
||||||
match *rvalue {
|
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) => {
|
Rvalue::Use(ref op) => {
|
||||||
self.eval_operand(op, source_info)
|
self.eval_operand(op, source_info)
|
||||||
},
|
},
|
||||||
|
23
src/test/ui/const-eval/issue-53157.rs
Normal file
23
src/test/ui/const-eval/issue-53157.rs
Normal file
@ -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());
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user