linux-sparse.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: linux-sparse@vger.kernel.org
Cc: Christopher Li <sparse@chrisli.org>,
	Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Subject: [PATCH v2 8/8] cleanup kill_instruction()
Date: Sun, 29 Jan 2017 11:48:08 +0100	[thread overview]
Message-ID: <20170129104808.2500-9-luc.vanoostenryck@gmail.com> (raw)
In-Reply-To: <20170129104808.2500-1-luc.vanoostenryck@gmail.com>

No functional changes:
- factorize out the '->bb = NULL' and '|= REPEAT_CSE'.
- fall through the switch cases for ternary/bunary/unary ops.

Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
 simplify.c | 47 +++++++++++++++++++++--------------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/simplify.c b/simplify.c
index 66550fa3d..f62fc83a1 100644
--- a/simplify.c
+++ b/simplify.c
@@ -188,54 +188,49 @@ void kill_instruction(struct instruction *insn)
 		return;
 
 	switch (insn->opcode) {
+	case OP_SEL:
+	case OP_RANGE:
+		kill_use(&insn->src3);
+		/* fall through */
+
 	case OP_BINARY ... OP_BINCMP_END:
-		insn->bb = NULL;
-		kill_use(&insn->src1);
 		kill_use(&insn->src2);
-		repeat_phase |= REPEAT_CSE;
-		return;
+		/* fall through */
 
 	case OP_CAST:
 	case OP_SCAST:
 	case OP_FPCAST:
 	case OP_PTRCAST:
 	case OP_NOT: case OP_NEG:
-		insn->bb = NULL;
 		kill_use(&insn->src1);
-		repeat_phase |= REPEAT_CSE;
-		return;
+		break;
 
 	case OP_PHI:
 		clear_phi(insn);
-		insn->bb = NULL;
-		repeat_phase |= REPEAT_CSE;
-		return;
+		break;
 
 	case OP_SYMADDR:
-		insn->bb = NULL;
-		repeat_phase |= REPEAT_CSE | REPEAT_SYMBOL_CLEANUP;
-		return;
+		repeat_phase |= REPEAT_SYMBOL_CLEANUP;
+		break;
 
-	case OP_SEL:
-	case OP_RANGE:
-		insn->bb = NULL;
-		repeat_phase |= REPEAT_CSE;
-		kill_use(&insn->src1);
-		kill_use(&insn->src2);
-		kill_use(&insn->src3);
-		return;
 	case OP_BR:
+		if (!insn->bb_true || !insn->bb_false)
+			break;
+		/* fall through */
+
 	case OP_COMPUTEDGOTO:
-		insn->bb = NULL;
-		repeat_phase |= REPEAT_CSE;
-		if (insn->bb_true && insn->bb_false)
-			kill_use(&insn->cond);
-		return;
+		kill_use(&insn->cond);
+		break;
 
 	case OP_ENTRY:
+	default:
 		/* ignore */
 		return;
 	}
+
+	insn->bb = NULL;
+	repeat_phase |= REPEAT_CSE;
+	return;
 }
 
 /*
-- 
2.11.0


  parent reply	other threads:[~2017-01-29 10:48 UTC|newest]

Thread overview: 38+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-29 10:48 [PATCH v2 0/8] fix uses of killed instructions Luc Van Oostenryck
2017-01-29 10:48 ` [PATCH v2 1/8] fix crash while testing between conditional & unconditional OP_BR Luc Van Oostenryck
2017-01-29 10:48 ` [PATCH v2 2/8] kill uses of replaced instructions Luc Van Oostenryck
2017-01-29 10:48 ` [PATCH v2 3/8] fix killing OP_PHI instructions Luc Van Oostenryck
2017-01-29 10:48 ` [PATCH v2 4/8] fix killing OP_CAST & friends Luc Van Oostenryck
2017-01-29 10:48 ` [PATCH v2 5/8] fix killing OP_SELECT Luc Van Oostenryck
2017-01-29 10:48 ` [PATCH v2 6/8] fix killing OP_COMPUTEDGOTO Luc Van Oostenryck
2017-01-29 10:48 ` [PATCH v2 7/8] explicitely ignore killing OP_ENTRY Luc Van Oostenryck
2017-01-29 10:48 ` Luc Van Oostenryck [this message]
2017-01-29 11:04 ` status of sparse-next Luc Van Oostenryck
2017-02-07 19:30 ` [PATCH v2 0/8] fix uses of killed instructions Van Oostenryck Luc
2017-02-08 16:50   ` Luc Van Oostenryck
2017-02-08 20:40     ` Christopher Li
2017-02-08 21:07       ` [PATCH] fix killing OP_SETVAL instructions Luc Van Oostenryck
2017-02-08 21:35       ` [PATCH v2 0/8] fix uses of killed instructions Luc Van Oostenryck
2017-02-08 22:13         ` Christopher Li
2017-02-08 22:28           ` Luc Van Oostenryck
2017-02-12 23:25             ` Luc Van Oostenryck
2017-02-12 23:38               ` Christopher Li
2017-02-13 16:59                 ` Luc Van Oostenryck
2017-02-12 23:28             ` [PATCH v2 00/14] testsuite improvements Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 01/14] testsuite: give a proper name to the 'binary-constant' test Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 02/14] testsuite: make tests known to fail effectively fail Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 03/14] testsuite: simplify the ioc-typecheck case Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 04/14] testsuite: add a simple test for -Wenum-mismatch Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 05/14] testsuite: add tag to ignore the output/error Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 06/14] testsuite: report as error tests known to fail but which succeed Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 07/14] allow to launch the test suite from the project root dir Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 08/14] testsuite: check patterns presence or absence in output Luc Van Oostenryck
2017-02-12 23:28               ` [PATCH v2 09/14] testsuite: add some selfchecking Luc Van Oostenryck
2017-02-12 23:29               ` [PATCH v2 10/14] testsuite: check the nbr of times a pattern should be present Luc Van Oostenryck
2017-02-12 23:29               ` [PATCH v2 11/14] testsuite: use 'error' instead of 'info' for successful tests known to fail Luc Van Oostenryck
2017-02-12 23:29               ` [PATCH v2 12/14] testsuite: get 'check-known-to-fail' earlier Luc Van Oostenryck
2017-02-12 23:29               ` [PATCH v2 13/14] testsuite: allow quieter error reporting Luc Van Oostenryck
2017-02-12 23:29               ` [PATCH v2 14/14] testsuite: quieter error reporting for 'known-to-fail' Luc Van Oostenryck
2017-02-13  1:53               ` [PATCH v2 00/14] testsuite improvements Christopher Li
2017-02-08 23:45           ` [PATCH v2 0/8] fix uses of killed instructions Luc Van Oostenryck
2017-02-09  0:09             ` Christopher Li

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170129104808.2500-9-luc.vanoostenryck@gmail.com \
    --to=luc.vanoostenryck@gmail.com \
    --cc=linux-sparse@vger.kernel.org \
    --cc=sparse@chrisli.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).