Re: [PR68001, CilkPlus] Fix for PR68001

[Jeff Law <law@redhat.com>]

On 11/02/2015 01:08 PM, Zamyatin, Igor wrote:
> Hi!
>
> This patch attempts to enhance error diagnostic in case of CilkPlus and fixes PR68001.
>
> Bootstrapped and regtested for x86_64.
> Is it ok for trunk?
>
> Thanks,
> Igor
>
> ChangeLog:
>
> c-family
>
> 2015-11-02  Igor Zamyatin  <igor.zamyatin@intel.com>
> k
> 	PR c++/68001
> 	* c-gimplify.c (c_gimplify_expr): Stop the process if see an error.
> 	* cilk.c (recognize_spawn): Determine location in a more precise
> 	way.
>
> cp
>
> 2015-11-02  Igor Zamyatin  <igor.zamyatin@intel.com>
>
> 	PR c++/68001
> 	* cp-gimplify.c (cp_gimplify_expr): Stop the process if see an error.
>
> testsuite
>
> 2015-11-02  Igor Zamyatin  <igor.zamyatin@intel.com>
>
> 	PR c++/68001
> 	* g++.dg/cilk-plus/CK/pr68001.cc: New test.
>
>
> diff --git a/gcc/c-family/c-gimplify.c b/gcc/c-family/c-gimplify.c
> index 92987b5..5b173d5 100644
> --- a/gcc/c-family/c-gimplify.c
> +++ b/gcc/c-family/c-gimplify.c
> @@ -283,15 +283,16 @@ c_gimplify_expr (tree *expr_p, gimple_seq *pre_p ATTRIBUTE_UNUSED,
>
>       case CILK_SPAWN_STMT:
>         gcc_assert
> -	(fn_contains_cilk_spawn_p (cfun)
> -	 && cilk_detect_spawn_and_unwrap (expr_p));
> +       (fn_contains_cilk_spawn_p (cfun)
> +	&& cilk_detect_spawn_and_unwrap (expr_p));
If you're trying to fix the formatting here, I think it ought to look like:

       gcc_assert (fn_contains_cilk_spawn_p (cfun)
                   && cilk_detect_spawn_and_unwrap (expr_p));

ie, go ahead and start the expression on the same line as the 
gcc_assert, line break before the &&, and indent the && just inside the 
open-paren.


>
> +static tree
> +contains_cilk_spawn_stmt_walker (tree *tp, int *, void *);
>   static void extract_free_variables (tree, struct wrapper_data *,
>   				    enum add_variable_type);
Please format in the same way the call to extract_free_variables is 
formatted.


>> @@ -733,16 +736,17 @@ cp_gimplify_expr (tree *expr_p, gimple_seq *pre_p, gimple_seq *post_p)
>         break;
>
>       case CILK_SPAWN_STMT:
> -      gcc_assert
> -	(fn_contains_cilk_spawn_p (cfun)
> -	 && cilk_detect_spawn_and_unwrap (expr_p));
> +      gcc_assert
> +       (fn_contains_cilk_spawn_p (cfun)
> +	&& cilk_detect_spawn_and_unwrap (expr_p));
Same formatting nit as c-gimplify.c


With the formatting nits fixed, this is fine.
jeff