3 files changed, 4 insertions, 25 deletions
diff --git a/ir.c b/ir.c
index 5116beaa..1890eb13 100644
--- a/ir.c
+++ b/ir.c
@@ -96,11 +96,7 @@ static int validate_insn(struct instruction *insn)
 		err += check_user(insn, insn->src2);
 		/* fall through */
 
-	case OP_CAST:
-	case OP_SCAST:
-	case OP_FPCAST:
-	case OP_PTRCAST:
-	case OP_NOT: case OP_NEG: case OP_FNEG:
+	case OP_UNOP ... OP_UNOP_END:
 	case OP_SLICE:
 	case OP_SYMADDR:
 	case OP_PHISOURCE:
diff --git a/liveness.c b/liveness.c
index e0e58329..4c3339f1 100644
--- a/liveness.c
+++ b/liveness.c
@@ -71,7 +71,7 @@ static void track_instruction_usage(struct basic_block *bb, struct instruction *
 		break;
 
 	/* Uni */
-	case OP_NOT: case OP_NEG: case OP_FNEG:
+	case OP_UNOP ... OP_UNOP_END:
 		USES(src1); DEFINES(target);
 		break;
 
@@ -111,13 +111,6 @@ static void track_instruction_usage(struct basic_block *bb, struct instruction *
 		USES(phi_src);
 		break;
 
-	case OP_CAST:
-	case OP_SCAST:
-	case OP_FPCAST:
-	case OP_PTRCAST:
-		USES(src); DEFINES(target);
-		break;
-
 	case OP_CALL:
 		USES(func);
 		if (insn->target != VOID)
diff --git a/simplify.c b/simplify.c
index eabe63ca..48f6f124 100644
--- a/simplify.c
+++ b/simplify.c
@@ -251,12 +251,8 @@ int kill_insn(struct instruction *insn, int force)
 		kill_use(&insn->src2);
 		/* fall through */
 
-	case OP_CAST:
-	case OP_SCAST:
-	case OP_FPCAST:
-	case OP_PTRCAST:
+	case OP_UNOP ... OP_UNOP_END:
 	case OP_SETVAL:
-	case OP_NOT: case OP_NEG: case OP_FNEG:
 	case OP_SLICE:
 		kill_use(&insn->src1);
 		break;
@@ -348,14 +344,8 @@ static int replace_with_pseudo(struct instruction *insn, pseudo_t pseudo)
 		kill_use(&insn->src3);
 	case OP_BINARY ... OP_BINCMP_END:
 		kill_use(&insn->src2);
-	case OP_NOT:
-	case OP_NEG:
-	case OP_FNEG:
+	case OP_UNOP ... OP_UNOP_END:
 	case OP_SYMADDR:
-	case OP_CAST:
-	case OP_SCAST:
-	case OP_FPCAST:
-	case OP_PTRCAST:
 		kill_use(&insn->src1);
 		break;