From: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
To: linux-sparse@vger.kernel.org
Cc: Christopher Li <sparse@chrisli.org>,
Dibyendu Majumdar <mobile@majumdar.org.uk>,
Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Subject: [PATCH v3 04/30] give a type to OP_PHISOURCE
Date: Sun, 19 Mar 2017 02:42:01 +0100 [thread overview]
Message-ID: <20170319014227.8833-5-luc.vanoostenryck@gmail.com> (raw)
In-Reply-To: <20170319014227.8833-1-luc.vanoostenryck@gmail.com>
Currently, OP_PHISOURCEs are given a size but not a type.
For consistency, give it a type too.
Signed-off-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
---
flow.c | 2 +-
linearize.c | 16 +++++++---------
linearize.h | 2 +-
memops.c | 2 +-
4 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/flow.c b/flow.c
index ec7e3f22c..9265a099d 100644
--- a/flow.c
+++ b/flow.c
@@ -371,7 +371,7 @@ found_dominator:
if (dominators && phisrc_in_bb(*dominators, parent))
continue;
br = delete_last_instruction(&parent->insns);
- phi = alloc_phi(parent, one->target, one->size);
+ phi = alloc_phi(parent, one->target, one->type);
phi->ident = phi->ident ? : pseudo->ident;
add_instruction(&parent->insns, br);
use_pseudo(insn, phi, add_pseudo(dominators, phi));
diff --git a/linearize.c b/linearize.c
index 54752a1a2..6eacb2e36 100644
--- a/linearize.c
+++ b/linearize.c
@@ -820,9 +820,9 @@ static pseudo_t argument_pseudo(struct entrypoint *ep, int nr)
return pseudo;
}
-pseudo_t alloc_phi(struct basic_block *source, pseudo_t pseudo, int size)
+pseudo_t alloc_phi(struct basic_block *source, pseudo_t pseudo, struct symbol *type)
{
- struct instruction *insn = alloc_instruction(OP_PHISOURCE, size);
+ struct instruction *insn = alloc_typed_instruction(OP_PHISOURCE, type);
pseudo_t phi = __alloc_pseudo(0);
static int nr = 0;
@@ -1369,19 +1369,18 @@ static pseudo_t linearize_short_conditional(struct entrypoint *ep, struct expres
struct basic_block *bb_false;
struct basic_block *merge = alloc_basic_block(ep, expr->pos);
pseudo_t phi1, phi2;
- int size = type_size(expr->ctype);
if (!expr_false || !ep->active)
return VOID;
bb_false = alloc_basic_block(ep, expr_false->pos);
src1 = linearize_expression(ep, cond);
- phi1 = alloc_phi(ep->active, src1, size);
+ phi1 = alloc_phi(ep->active, src1, expr->ctype);
add_branch(ep, expr, src1, merge, bb_false);
set_activeblock(ep, bb_false);
src2 = linearize_expression(ep, expr_false);
- phi2 = alloc_phi(ep->active, src2, size);
+ phi2 = alloc_phi(ep->active, src2, expr->ctype);
set_activeblock(ep, merge);
return add_join_conditional(ep, expr, phi1, phi2);
@@ -1395,7 +1394,6 @@ static pseudo_t linearize_conditional(struct entrypoint *ep, struct expression *
pseudo_t src1, src2;
pseudo_t phi1, phi2;
struct basic_block *bb_true, *bb_false, *merge;
- int size = type_size(expr->ctype);
if (!cond || !expr_true || !expr_false || !ep->active)
return VOID;
@@ -1407,12 +1405,12 @@ static pseudo_t linearize_conditional(struct entrypoint *ep, struct expression *
set_activeblock(ep, bb_true);
src1 = linearize_expression(ep, expr_true);
- phi1 = alloc_phi(ep->active, src1, size);
+ phi1 = alloc_phi(ep->active, src1, expr->ctype);
add_goto(ep, merge);
set_activeblock(ep, bb_false);
src2 = linearize_expression(ep, expr_false);
- phi2 = alloc_phi(ep->active, src2, size);
+ phi2 = alloc_phi(ep->active, src2, expr->ctype);
set_activeblock(ep, merge);
return add_join_conditional(ep, expr, phi1, phi2);
@@ -1894,7 +1892,7 @@ static pseudo_t linearize_return(struct entrypoint *ep, struct statement *stmt)
phi_node->bb = bb_return;
add_instruction(&bb_return->insns, phi_node);
}
- phi = alloc_phi(active, src, type_size(expr->ctype));
+ phi = alloc_phi(active, src, expr->ctype);
phi->ident = &return_ident;
use_pseudo(phi_node, phi, add_pseudo(&phi_node->phi_list, phi));
}
diff --git a/linearize.h b/linearize.h
index 0cdd0fa9a..d437e268d 100644
--- a/linearize.h
+++ b/linearize.h
@@ -339,7 +339,7 @@ struct entrypoint {
extern void insert_select(struct basic_block *bb, struct instruction *br, struct instruction *phi, pseudo_t if_true, pseudo_t if_false);
extern void insert_branch(struct basic_block *bb, struct instruction *br, struct basic_block *target);
-pseudo_t alloc_phi(struct basic_block *source, pseudo_t pseudo, int size);
+pseudo_t alloc_phi(struct basic_block *source, pseudo_t pseudo, struct symbol *type);
pseudo_t alloc_pseudo(struct instruction *def);
pseudo_t value_pseudo(long long val);
diff --git a/memops.c b/memops.c
index 5efdd6f2d..187a63284 100644
--- a/memops.c
+++ b/memops.c
@@ -52,7 +52,7 @@ no_dominance:
found_dominator:
br = delete_last_instruction(&parent->insns);
- phi = alloc_phi(parent, one->target, one->size);
+ phi = alloc_phi(parent, one->target, one->type);
phi->ident = phi->ident ? : one->target->ident;
add_instruction(&parent->insns, br);
use_pseudo(insn, phi, add_pseudo(dominators, phi));
--
2.12.0
next prev parent reply other threads:[~2017-03-19 1:42 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-03-19 1:41 [PATCH 00/30] LLVM fixes Luc Van Oostenryck
2017-03-19 1:41 ` [PATCH v3 01/30] fix usage of inlined calls Luc Van Oostenryck
2017-03-19 1:41 ` [PATCH v3 02/30] inlined calls should not block BB packing Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 03/30] give function's arguments a type via OP_PUSH Luc Van Oostenryck
2017-03-19 1:42 ` Luc Van Oostenryck [this message]
2017-03-19 1:42 ` [PATCH v3 05/30] give a type to OP_SEL, always Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 06/30] llvm: remove unneeded arg 'module' Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 07/30] llvm: remove unneeded 'generation' Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 08/30] llvm: remove unneeded function::type Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 09/30] llvm: reduce scope of 'bb_nr' Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 10/30] llvm: use pseudo_list_size() instead of open coding it Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 11/30] llvm: give arguments a name Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 12/30] llvm: give a name to call's return values Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 13/30] llvm: avoid useless temp variable Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 14/30] llvm: extract get_sym_value() from pseudo_to_value() Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 15/30] llvm: fix test of floating-point type Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 16/30] llvm: fix translation of PSEUDO_VALs into a ValueRefs Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 17/30] llvm: fix output_op_store() which modify its operand Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 18/30] llvm: fix output_op_[ptr]cast() Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 19/30] llvm: take care of degenerated rvalues Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 20/30] llvm: add test cases for symbol's address Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 21/30] llvm: add test cases for pointers passed as argument Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 22/30] llvm: add test cases for arrays " Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 23/30] llvm: add test cases for degenerated pointers Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 24/30] llvm: add support for OP_NEG Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 25/30] llvm: fix pointer/float mixup in comparisons Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 26/30] llvm: fix type in comparison with an address constant Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 27/30] llvm: give correct type to binops Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 28/30] llvm: adjust OP_RET's type Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 29/30] llvm: variadic functions are not being marked as such Luc Van Oostenryck
2017-03-19 1:42 ` [PATCH v3 30/30] llvm: fix type of switch constants Luc Van Oostenryck
2017-03-19 16:09 ` [PATCH 00/30] LLVM fixes Dibyendu Majumdar
2017-03-19 18:41 ` Dibyendu Majumdar
2017-03-19 16:28 ` Christopher Li
2017-03-19 16:51 ` Luc Van Oostenryck
2017-03-19 21:02 ` Luc Van Oostenryck
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=20170319014227.8833-5-luc.vanoostenryck@gmail.com \
--to=luc.vanoostenryck@gmail.com \
--cc=linux-sparse@vger.kernel.org \
--cc=mobile@majumdar.org.uk \
--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).