From 45d9341420accb24e2ffdd64fa47d91e86d24122 Mon Sep 17 00:00:00 2001 From: Richard Sandiford Date: Wed, 3 May 2017 07:51:08 +0000 Subject: [PATCH] Wrap tree-data-ref.h macro arguments gcc/ 2016-05-03 Richard Sandiford * tree-data-ref.h (SUB_CONFLICTS_IN_A): Wrap SUB argument in brackets. (SUB_CONFLICTS_IN_B, SUB_LAST_CONFLICT, SUB_DISTANCE): Likewise. (DDR_A): Wrap DDR argument in brackets. (DDR_B, DDR_AFFINE_P, DDR_ARE_DEPENDENT, DDR_SUBSCRIPTS): Likewise. (DDR_LOOP_NEST, DDR_INNER_LOOP, DDR_SELF_REFERENCE): Likewise. (DDR_REVERSED_P): Likewise. From-SVN: r247539 --- ChangeLog | 4 ++++ gcc/ChangeLog | 9 +++++++++ gcc/tree-data-ref.h | 26 +++++++++++++------------- 3 files changed, 26 insertions(+), 13 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6066ba6e82e..6b547761ac5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2017-05-03 Richard Sandiford + +Wrap tree-data-ref.h macro arguments + 2017-04-19 Thomas Koenig Tobias Burnus diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c565697058e..847ba314d1f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2017-05-03 Richard Sandiford + + * tree-data-ref.h (SUB_CONFLICTS_IN_A): Wrap SUB argument in brackets. + (SUB_CONFLICTS_IN_B, SUB_LAST_CONFLICT, SUB_DISTANCE): Likewise. + (DDR_A): Wrap DDR argument in brackets. + (DDR_B, DDR_AFFINE_P, DDR_ARE_DEPENDENT, DDR_SUBSCRIPTS): Likewise. + (DDR_LOOP_NEST, DDR_INNER_LOOP, DDR_SELF_REFERENCE): Likewise. + (DDR_REVERSED_P): Likewise. + 2017-05-03 Jakub Jelinek PR tree-optimization/79472 diff --git a/gcc/tree-data-ref.h b/gcc/tree-data-ref.h index 9003ea54a2d..3a54120138d 100644 --- a/gcc/tree-data-ref.h +++ b/gcc/tree-data-ref.h @@ -209,10 +209,10 @@ struct subscript typedef struct subscript *subscript_p; -#define SUB_CONFLICTS_IN_A(SUB) SUB->conflicting_iterations_in_a -#define SUB_CONFLICTS_IN_B(SUB) SUB->conflicting_iterations_in_b -#define SUB_LAST_CONFLICT(SUB) SUB->last_conflict -#define SUB_DISTANCE(SUB) SUB->distance +#define SUB_CONFLICTS_IN_A(SUB) (SUB)->conflicting_iterations_in_a +#define SUB_CONFLICTS_IN_B(SUB) (SUB)->conflicting_iterations_in_b +#define SUB_LAST_CONFLICT(SUB) (SUB)->last_conflict +#define SUB_DISTANCE(SUB) (SUB)->distance /* A data_dependence_relation represents a relation between two data_references A and B. */ @@ -268,20 +268,20 @@ struct data_dependence_relation typedef struct data_dependence_relation *ddr_p; -#define DDR_A(DDR) DDR->a -#define DDR_B(DDR) DDR->b -#define DDR_AFFINE_P(DDR) DDR->affine_p -#define DDR_ARE_DEPENDENT(DDR) DDR->are_dependent -#define DDR_SUBSCRIPTS(DDR) DDR->subscripts +#define DDR_A(DDR) (DDR)->a +#define DDR_B(DDR) (DDR)->b +#define DDR_AFFINE_P(DDR) (DDR)->affine_p +#define DDR_ARE_DEPENDENT(DDR) (DDR)->are_dependent +#define DDR_SUBSCRIPTS(DDR) (DDR)->subscripts #define DDR_SUBSCRIPT(DDR, I) DDR_SUBSCRIPTS (DDR)[I] #define DDR_NUM_SUBSCRIPTS(DDR) DDR_SUBSCRIPTS (DDR).length () -#define DDR_LOOP_NEST(DDR) DDR->loop_nest +#define DDR_LOOP_NEST(DDR) (DDR)->loop_nest /* The size of the direction/distance vectors: the number of loops in the loop nest. */ #define DDR_NB_LOOPS(DDR) (DDR_LOOP_NEST (DDR).length ()) -#define DDR_INNER_LOOP(DDR) DDR->inner_loop -#define DDR_SELF_REFERENCE(DDR) DDR->self_reference_p +#define DDR_INNER_LOOP(DDR) (DDR)->inner_loop +#define DDR_SELF_REFERENCE(DDR) (DDR)->self_reference_p #define DDR_DIST_VECTS(DDR) ((DDR)->dist_vects) #define DDR_DIR_VECTS(DDR) ((DDR)->dir_vects) @@ -293,7 +293,7 @@ typedef struct data_dependence_relation *ddr_p; DDR_DIR_VECTS (DDR)[I] #define DDR_DIST_VECT(DDR, I) \ DDR_DIST_VECTS (DDR)[I] -#define DDR_REVERSED_P(DDR) DDR->reversed_p +#define DDR_REVERSED_P(DDR) (DDR)->reversed_p bool dr_analyze_innermost (struct data_reference *, struct loop *); -- 2.30.2