From c2174db34e0056dc0355789f0a3c93045e25f62f Mon Sep 17 00:00:00 2001 From: jakub Date: Thu, 13 Jun 2019 12:51:39 +0000 Subject: [PATCH] * config/nvptx/nvptx.c (nvptx_sese_number, nvptx_sese_pseudo): Don't wrap ei variable name in the declaration in ()s. (nvptx_single): Actually use mode_label variable. Formatting fix. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@272243 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/config/nvptx/nvptx.c | 15 +++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7fe06d26f49b..b8eba5e1c484 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2019-06-13 Jakub Jelinek + + * config/nvptx/nvptx.c (nvptx_sese_number, nvptx_sese_pseudo): Don't + wrap ei variable name in the declaration in ()s. + (nvptx_single): Actually use mode_label variable. Formatting fix. + 2019-06-13 Richard Biener * tree-vectorizer.h (vect_loop_vectorized_call): Declare. diff --git a/gcc/config/nvptx/nvptx.c b/gcc/config/nvptx/nvptx.c index 76468f635867..c53a1ae9f26a 100644 --- a/gcc/config/nvptx/nvptx.c +++ b/gcc/config/nvptx/nvptx.c @@ -3552,7 +3552,7 @@ nvptx_sese_number (int n, int p, int dir, basic_block b, size_t offset = (dir > 0 ? offsetof (edge_def, dest) : offsetof (edge_def, src)); edge e; - edge_iterator (ei); + edge_iterator ei; FOR_EACH_EDGE (e, ei, edges) { @@ -3575,7 +3575,7 @@ nvptx_sese_pseudo (basic_block me, bb_sese *sese, int depth, int dir, vec *edges, size_t offset) { edge e; - edge_iterator (ei); + edge_iterator ei; int hi_back = depth; pseudo_node_t node_back (0, depth); int hi_child = depth; @@ -4403,8 +4403,10 @@ nvptx_single (unsigned mask, basic_block from, basic_block to) { rtx_code_label *label = gen_label_rtx (); rtx pred = cfun->machine->axis_predicate[mode - GOMP_DIM_WORKER]; - rtx_insn **mode_jump = mode == GOMP_DIM_VECTOR ? &vector_jump : &worker_jump; - rtx_insn **mode_label = mode == GOMP_DIM_VECTOR ? &vector_label : &worker_label; + rtx_insn **mode_jump + = mode == GOMP_DIM_VECTOR ? &vector_jump : &worker_jump; + rtx_insn **mode_label + = mode == GOMP_DIM_VECTOR ? &vector_label : &worker_label; if (!pred) { @@ -4438,10 +4440,7 @@ nvptx_single (unsigned mask, basic_block from, basic_block to) emit_insn_after (gen_exit (), label_insn); } - if (mode == GOMP_DIM_VECTOR) - vector_label = label_insn; - else - worker_label = label_insn; + *mode_label = label_insn; } /* Now deal with propagating the branch condition. */ -- 2.39.2