Move the nop lowering to ISLE, and remove the final return from lower.rs

bytecodealliance · Aug 29, 2022 · d1ada21 · d1ada21
1 parent 500a9f1
commit d1ada21
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/cranelift/codegen/src/isa/x64/lower.isle b/cranelift/codegen/src/isa/x64/lower.isle
@@ -3757,3 +3757,9 @@
 
         ;; SHUFPS xmm_y, xmm_xmp, 0x88
         (x64_shufps dst zeros 0x88)))
+
+;; Rules for `nop` ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+(rule (lower (nop))
+      (invalid_reg))
+
diff --git a/cranelift/codegen/src/isa/x64/lower.rs b/cranelift/codegen/src/isa/x64/lower.rs
@@ -459,7 +459,8 @@ fn lower_insn_to_regs(
         | Opcode::Isplit
         | Opcode::TlsValue
         | Opcode::SqmulRoundSat
-        | Opcode::Uunarrow => {
+        | Opcode::Uunarrow
+        | Opcode::Nop => {
             let ty = if outputs.len() > 0 {
                 Some(ctx.output_ty(insn, 0))
             } else {
@@ -573,12 +574,7 @@ fn lower_insn_to_regs(
             panic!("Branch opcode reached non-branch lowering logic!");
         }
 
-        Opcode::Nop => {
-            // Nothing.
-        }
     }
-
-    Ok(())
 }
 
 //=============================================================================