nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-27 09:14:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove a workaround for icmp.i8/i16 not having an encoding

Browse Source
This commit is contained in:
bjorn3 2018-11-17 15:02:57 +01:00
parent e3bbef764c
commit 16334be18e
2 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
example/mini_core.rs
View File

@ -1,4 +1,4 @@
#![feature(no_core, lang_items, intrinsics, unboxed_closures)]
#![feature(no_core, lang_items, intrinsics, unboxed_closures, type_ascription)]
#![no_core]
#![allow(dead_code)]
@ -246,7 +246,7 @@ pub struct Box<T: ?Sized>(*mut T);
impl<T: ?Sized + Unsize<U>, U: ?Sized> CoerceUnsized<Box<U>> for Box<T> {}
static mut MY_TINY_HEAP: [u8; 16] = [0; 16];
static mut MY_TINY_HEAP: [u8; 16] = [0xff; 16];
#[lang = "exchange_malloc"]
unsafe fn allocate(size: usize, _align: usize) -> *mut u8 {

13
src/base.rs
View File

@ -18,7 +18,9 @@ pub fn trans_mono_item<'a, 'tcx: 'a>(
) {
match mono_item {
MonoItem::Fn(inst) => {
let _inst_guard = PrintOnPanic(|| format!("{:?}", inst));
let _inst_guard = PrintOnPanic(|| {
format!("{:?} {}", inst, tcx.symbol_name(inst).as_str())
});
let _mir_guard = PrintOnPanic(|| {
match inst.def {
InstanceDef::Item(_)
@ -761,14 +763,7 @@ macro_rules! binop_match {
assert_eq!($fx.tcx.types.bool, $ret_ty);
let ret_layout = $fx.layout_of($ret_ty);
// TODO HACK no encoding for icmp.i8
use crate::common::clif_intcast;
let (lhs, rhs) = (
clif_intcast($fx, $lhs, types::I64, $signed),
clif_intcast($fx, $rhs, types::I64, $signed),
);
let b = $fx.bcx.ins().icmp(IntCC::$cc, lhs, rhs);
let b = $fx.bcx.ins().icmp(IntCC::$cc, $lhs, $rhs);
CValue::ByVal($fx.bcx.ins().bint(types::I8, b), ret_layout)
}};
(@single $fx:expr, $bug_fmt:expr, $var:expr, $signed:expr, $lhs:expr, $rhs:expr, $ret_ty:expr, fcmp($cc:ident)) => {{