fuzz: move control plane into emit state

Co-authored-by: Falk Zwimpfer <[email protected]>
Co-authored-by: Moritz Waser <[email protected]>

cranelift/codegen/src/isa/aarch64/inst/emit_tests.rs

@@ -6,7 +6,6 @@ use crate::settings;
 
 use alloc::boxed::Box;
 use alloc::vec::Vec;
-use cranelift_control::ControlPlane;
 
 #[cfg(test)]
 fn simm9_zero() -> SImm9 {
@@ -7810,16 +7809,9 @@ fn test_aarch64_binemit() {
             insn.print_with_state(&mut EmitState::default(), &mut AllocationConsumer::new(&[]));
         assert_eq!(expected_printing, actual_printing);
 
-        let ctrl_plane = &mut ControlPlane::default();
         let mut buffer = MachBuffer::new();
-        insn.emit(
-            &[],
-            &mut buffer,
-            &emit_info,
-            &mut Default::default(),
-            ctrl_plane,
-        );
-        let buffer = buffer.finish(ctrl_plane);
+        insn.emit(&[], &mut buffer, &emit_info, &mut Default::default());
+        let buffer = buffer.finish(&mut Default::default());
         let actual_encoding = &buffer.stringify_code_bytes();
         assert_eq!(expected_encoding, actual_encoding);
     }

cranelift/codegen/src/isa/aarch64/inst/unwind/systemv.rs

@@ -75,7 +75,6 @@ mod tests {
     use crate::isa::{lookup, CallConv};
     use crate::settings::{builder, Flags};
     use crate::Context;
-    use cranelift_control::ControlPlane;
     use gimli::write::Address;
     use std::str::FromStr;
     use target_lexicon::triple;
@@ -93,7 +92,7 @@ mod tests {
         ));
 
         let code = context
-            .compile(&*isa, &mut ControlPlane::default())
+            .compile(&*isa, &mut Default::default())
             .expect("expected compilation");
 
         let fde = match code
@@ -134,7 +133,7 @@ mod tests {
         let mut context = Context::for_function(create_multi_return_function(CallConv::SystemV));
 
         let code = context
-            .compile(&*isa, &mut ControlPlane::default())
+            .compile(&*isa, &mut Default::default())
             .expect("expected compilation");
 
         let fde = match code

cranelift/codegen/src/isa/mod.rs

@@ -100,15 +100,9 @@ pub fn lookup(triple: Triple) -> Result<Builder, LookupError> {
         Architecture::X86_64 => {
             isa_builder!(x64, (feature = "x86"), triple)
         }
-        Architecture::Aarch64 { .. } => {
-            isa_builder!(aarch64, (feature = "arm64"), triple)
-        }
-        Architecture::S390x { .. } => {
-            isa_builder!(s390x, (feature = "s390x"), triple)
-        }
-        Architecture::Riscv64 { .. } => {
-            isa_builder!(riscv64, (feature = "riscv64"), triple)
-        }
+        Architecture::Aarch64 { .. } => isa_builder!(aarch64, (feature = "arm64"), triple),
+        Architecture::S390x { .. } => isa_builder!(s390x, (feature = "s390x"), triple),
+        Architecture::Riscv64 { .. } => isa_builder!(riscv64, (feature = "riscv64"), triple),
         _ => Err(LookupError::Unsupported),
     }
 }