@@ -2518,6 +2518,7 @@ mod test {
25182518
25192519 use super :: * ;
25202520 use crate :: ir:: UserExternalNameRef ;
2521+ use crate :: isa:: aarch64;
25212522 use crate :: isa:: aarch64:: inst:: { BranchTarget , CondBrKind , EmitInfo , Inst } ;
25222523 use crate :: isa:: aarch64:: inst:: { OperandSize , xreg} ;
25232524 use crate :: machinst:: { MachInstEmit , MachInstEmitState } ;
@@ -2530,9 +2531,15 @@ mod test {
25302531 BranchTarget :: Label ( label ( n) )
25312532 }
25322533
2534+ fn emit_info ( ) -> EmitInfo {
2535+ let flags = settings:: Flags :: new ( settings:: builder ( ) ) ;
2536+ let isa_flags = aarch64:: settings:: Flags :: new ( & flags, & aarch64:: settings:: builder ( ) ) ;
2537+ EmitInfo :: new ( flags, isa_flags)
2538+ }
2539+
25332540 #[ test]
25342541 fn test_elide_jump_to_next ( ) {
2535- let info = EmitInfo :: new ( settings :: Flags :: new ( settings :: builder ( ) ) ) ;
2542+ let info = emit_info ( ) ;
25362543 let mut buf = MachBuffer :: new ( ) ;
25372544 let mut state = <Inst as MachInstEmit >:: State :: default ( ) ;
25382545 let constants = Default :: default ( ) ;
@@ -2548,7 +2555,7 @@ mod test {
25482555
25492556 #[ test]
25502557 fn test_elide_trivial_jump_blocks ( ) {
2551- let info = EmitInfo :: new ( settings :: Flags :: new ( settings :: builder ( ) ) ) ;
2558+ let info = emit_info ( ) ;
25522559 let mut buf = MachBuffer :: new ( ) ;
25532560 let mut state = <Inst as MachInstEmit >:: State :: default ( ) ;
25542561 let constants = Default :: default ( ) ;
@@ -2579,7 +2586,7 @@ mod test {
25792586
25802587 #[ test]
25812588 fn test_flip_cond ( ) {
2582- let info = EmitInfo :: new ( settings :: Flags :: new ( settings :: builder ( ) ) ) ;
2589+ let info = emit_info ( ) ;
25832590 let mut buf = MachBuffer :: new ( ) ;
25842591 let mut state = <Inst as MachInstEmit >:: State :: default ( ) ;
25852592 let constants = Default :: default ( ) ;
@@ -2625,7 +2632,7 @@ mod test {
26252632
26262633 #[ test]
26272634 fn test_island ( ) {
2628- let info = EmitInfo :: new ( settings :: Flags :: new ( settings :: builder ( ) ) ) ;
2635+ let info = emit_info ( ) ;
26292636 let mut buf = MachBuffer :: new ( ) ;
26302637 let mut state = <Inst as MachInstEmit >:: State :: default ( ) ;
26312638 let constants = Default :: default ( ) ;
@@ -2694,7 +2701,7 @@ mod test {
26942701
26952702 #[ test]
26962703 fn test_island_backward ( ) {
2697- let info = EmitInfo :: new ( settings :: Flags :: new ( settings :: builder ( ) ) ) ;
2704+ let info = emit_info ( ) ;
26982705 let mut buf = MachBuffer :: new ( ) ;
26992706 let mut state = <Inst as MachInstEmit >:: State :: default ( ) ;
27002707 let constants = Default :: default ( ) ;
@@ -2780,7 +2787,7 @@ mod test {
27802787 // label7:
27812788 // ret
27822789
2783- let info = EmitInfo :: new ( settings :: Flags :: new ( settings :: builder ( ) ) ) ;
2790+ let info = emit_info ( ) ;
27842791 let mut buf = MachBuffer :: new ( ) ;
27852792 let mut state = <Inst as MachInstEmit >:: State :: default ( ) ;
27862793 let constants = Default :: default ( ) ;
@@ -2857,7 +2864,7 @@ mod test {
28572864 //
28582865 // label0, label1, ..., label4:
28592866 // b label0
2860- let info = EmitInfo :: new ( settings :: Flags :: new ( settings :: builder ( ) ) ) ;
2867+ let info = emit_info ( ) ;
28612868 let mut buf = MachBuffer :: new ( ) ;
28622869 let mut state = <Inst as MachInstEmit >:: State :: default ( ) ;
28632870 let constants = Default :: default ( ) ;
0 commit comments