Skip to content

Commit

Permalink
Fix ICE on i686 when calling immediate() on OperandValue::Ref in return
Browse files Browse the repository at this point in the history
  • Loading branch information
Mark-Simulacrum committed Jan 5, 2017
1 parent 74e5b7d commit 97c008c
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 1 deletion.
6 changes: 5 additions & 1 deletion src/librustc_trans/mir/block.rs
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,11 @@ impl<'a, 'tcx> MirContext<'a, 'tcx> {
load
} else {
let op = self.trans_consume(&bcx, &mir::Lvalue::Local(mir::RETURN_POINTER));
op.pack_if_pair(&bcx).immediate()
if let Ref(llval) = op.val {
base::load_ty(&bcx, llval, op.ty)
} else {
op.pack_if_pair(&bcx).immediate()
}
};
bcx.ret(llval);
}
Expand Down
21 changes: 21 additions & 0 deletions src/test/run-pass/issue-38727.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// Copyright 2017 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.

#[repr(u64)]
enum A {
A = 0u64,
B = !0u64,
}

fn cmp() -> A {
A::B
}

fn main() {}

0 comments on commit 97c008c

Please sign in to comment.