diff --git a/cranelift/codegen/meta/src/cdsl/instructions.rs b/cranelift/codegen/meta/src/cdsl/instructions.rs index 9db2bfba81..40491d9cec 100644 --- a/cranelift/codegen/meta/src/cdsl/instructions.rs +++ b/cranelift/codegen/meta/src/cdsl/instructions.rs @@ -76,8 +76,6 @@ pub(crate) struct InstructionContent { pub is_call: bool, /// Is this a return instruction? pub is_return: bool, - /// Is this a ghost instruction? - pub is_ghost: bool, /// Can this instruction read from memory? pub can_load: bool, /// Can this instruction write to memory? @@ -148,7 +146,6 @@ pub(crate) struct InstructionBuilder { is_indirect_branch: bool, is_call: bool, is_return: bool, - is_ghost: bool, can_load: bool, can_store: bool, can_trap: bool, @@ -171,7 +168,6 @@ impl InstructionBuilder { is_indirect_branch: false, is_call: false, is_return: false, - is_ghost: false, can_load: false, can_store: false, can_trap: false, @@ -228,12 +224,6 @@ impl InstructionBuilder { self } - #[allow(clippy::wrong_self_convention)] - pub fn is_ghost(mut self, val: bool) -> Self { - self.is_ghost = val; - self - } - pub fn can_load(mut self, val: bool) -> Self { self.can_load = val; self @@ -303,7 +293,6 @@ impl InstructionBuilder { is_indirect_branch: self.is_indirect_branch, is_call: self.is_call, is_return: self.is_return, - is_ghost: self.is_ghost, can_load: self.can_load, can_store: self.can_store, can_trap: self.can_trap, diff --git a/cranelift/codegen/meta/src/gen_inst.rs b/cranelift/codegen/meta/src/gen_inst.rs index 13f4776d3b..c8c91ad604 100644 --- a/cranelift/codegen/meta/src/gen_inst.rs +++ b/cranelift/codegen/meta/src/gen_inst.rs @@ -489,13 +489,6 @@ fn gen_opcodes(all_inst: &AllInstructions, fmt: &mut Formatter) { "Is this a return instruction?", fmt, ); - gen_bool_accessor( - all_inst, - |inst| inst.is_ghost, - "is_ghost", - "Is this a ghost instruction?", - fmt, - ); gen_bool_accessor( all_inst, |inst| inst.can_load, diff --git a/cranelift/codegen/meta/src/shared/instructions.rs b/cranelift/codegen/meta/src/shared/instructions.rs index 01865ccba1..9ddca0bb82 100644 --- a/cranelift/codegen/meta/src/shared/instructions.rs +++ b/cranelift/codegen/meta/src/shared/instructions.rs @@ -2047,8 +2047,7 @@ pub(crate) fn define( &formats.unary, ) .operands_in(vec![x]) - .operands_out(vec![lo, hi]) - .is_ghost(true), + .operands_out(vec![lo, hi]), ); let Any128 = &TypeVar::new( @@ -2083,8 +2082,7 @@ pub(crate) fn define( &formats.binary, ) .operands_in(vec![x, y]) - .operands_out(vec![a]) - .is_ghost(true), + .operands_out(vec![a]), ); let c = &Operand::new("c", &TxN.as_bool()).with_doc("Controlling vector"); @@ -4386,8 +4384,7 @@ pub(crate) fn define( &formats.unary, ) .operands_in(vec![x]) - .operands_out(vec![lo, hi]) - .is_ghost(true), + .operands_out(vec![lo, hi]), ); let NarrowInt = &TypeVar::new( @@ -4417,8 +4414,7 @@ pub(crate) fn define( &formats.binary, ) .operands_in(vec![lo, hi]) - .operands_out(vec![a]) - .is_ghost(true), + .operands_out(vec![a]), ); // Instructions relating to atomic memory accesses and fences