Remove and reorganize IntCC/FloatCC imports to avoid a build warning;

This commit is contained in:
Benjamin Bouvier
2019-04-25 16:54:52 +02:00
parent dca168f350
commit 18a5386c08

View File

@@ -4,7 +4,7 @@ use super::registers::*;
use crate::bitset::BitSet; use crate::bitset::BitSet;
use crate::cursor::{Cursor, FuncCursor}; use crate::cursor::{Cursor, FuncCursor};
use crate::flowgraph::ControlFlowGraph; use crate::flowgraph::ControlFlowGraph;
use crate::ir::condcodes::IntCC; use crate::ir::condcodes::{FloatCC, IntCC};
use crate::ir::{self, Function, Inst, InstBuilder}; use crate::ir::{self, Function, Inst, InstBuilder};
use crate::isa; use crate::isa;
use crate::isa::constraints::*; use crate::isa::constraints::*;
@@ -280,8 +280,6 @@ fn expand_minmax(
cfg: &mut ControlFlowGraph, cfg: &mut ControlFlowGraph,
_isa: &isa::TargetIsa, _isa: &isa::TargetIsa,
) { ) {
use crate::ir::condcodes::FloatCC;
let (x, y, x86_opc, bitwise_opc) = match func.dfg[inst] { let (x, y, x86_opc, bitwise_opc) = match func.dfg[inst] {
ir::InstructionData::Binary { ir::InstructionData::Binary {
opcode: ir::Opcode::Fmin, opcode: ir::Opcode::Fmin,
@@ -374,8 +372,6 @@ fn expand_fcvt_from_uint(
cfg: &mut ControlFlowGraph, cfg: &mut ControlFlowGraph,
_isa: &isa::TargetIsa, _isa: &isa::TargetIsa,
) { ) {
use crate::ir::condcodes::IntCC;
let x; let x;
match func.dfg[inst] { match func.dfg[inst] {
ir::InstructionData::Unary { ir::InstructionData::Unary {
@@ -447,7 +443,6 @@ fn expand_fcvt_to_sint(
cfg: &mut ControlFlowGraph, cfg: &mut ControlFlowGraph,
_isa: &isa::TargetIsa, _isa: &isa::TargetIsa,
) { ) {
use crate::ir::condcodes::{FloatCC, IntCC};
use crate::ir::immediates::{Ieee32, Ieee64}; use crate::ir::immediates::{Ieee32, Ieee64};
let x = match func.dfg[inst] { let x = match func.dfg[inst] {
@@ -543,7 +538,6 @@ fn expand_fcvt_to_sint_sat(
cfg: &mut ControlFlowGraph, cfg: &mut ControlFlowGraph,
_isa: &isa::TargetIsa, _isa: &isa::TargetIsa,
) { ) {
use crate::ir::condcodes::{FloatCC, IntCC};
use crate::ir::immediates::{Ieee32, Ieee64}; use crate::ir::immediates::{Ieee32, Ieee64};
let x = match func.dfg[inst] { let x = match func.dfg[inst] {
@@ -663,7 +657,6 @@ fn expand_fcvt_to_uint(
cfg: &mut ControlFlowGraph, cfg: &mut ControlFlowGraph,
_isa: &isa::TargetIsa, _isa: &isa::TargetIsa,
) { ) {
use crate::ir::condcodes::{FloatCC, IntCC};
use crate::ir::immediates::{Ieee32, Ieee64}; use crate::ir::immediates::{Ieee32, Ieee64};
let x = match func.dfg[inst] { let x = match func.dfg[inst] {
@@ -745,7 +738,6 @@ fn expand_fcvt_to_uint_sat(
cfg: &mut ControlFlowGraph, cfg: &mut ControlFlowGraph,
_isa: &isa::TargetIsa, _isa: &isa::TargetIsa,
) { ) {
use crate::ir::condcodes::{FloatCC, IntCC};
use crate::ir::immediates::{Ieee32, Ieee64}; use crate::ir::immediates::{Ieee32, Ieee64};
let x = match func.dfg[inst] { let x = match func.dfg[inst] {