Skip to content

Commit

Permalink
Auto merge of #53163 - oli-obk:const_prop_ice, r=nikomatsakis
Browse files Browse the repository at this point in the history
Remove an overly pedantic and wrong assertion

fixes #53157
fixes #53087
  • Loading branch information
bors committed Aug 8, 2018
2 parents 376b60d + 8935f99 commit 62e4e08
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 5 deletions.
5 changes: 0 additions & 5 deletions src/librustc_mir/transform/const_prop.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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)
},
Expand Down
23 changes: 23 additions & 0 deletions src/test/ui/const-eval/issue-53157.rs
Original file line number Diff line number Diff line change
@@ -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());
}

0 comments on commit 62e4e08

Please sign in to comment.