On Tue, Oct 11, 2016 at 3:00 PM, Jakub Jelinek <ja...@redhat.com> wrote:
> On Tue, Oct 11, 2016 at 02:47:34PM -0400, Fritz Reese wrote:
>> On Tue, Oct 11, 2016 at 2:44 PM, Fritz Reese <fritzore...@gmail.com> wrote:
>> > On Mon, 2016-10-11 08:43 AM, Markus Trippelsdorf <mar...@trippelsdorf.de>
>> > wrote:
>> >> This patch breaks bootstrap:
>> > ...
>> >
>> > Sorry all!! was in a rush to get in the car this morning and made a
>> > hasty commit. Fixed for r241001 (sorry Jerry, I was a little too
>> > slow.)
>
> While looking at the changes, I've noticed various coding style and
> formatting issues (mainly wrong indentation).
>
> The patch below should resolve what I've noticed. Ok for trunk if it passes
> bootstrap/regtest?
>
> 2016-10-11 Jakub Jelinek <ja...@redhat.com>
>
> * iresolve.c (is_trig_resolved, resolve_trig_call): Formatting fixes.
> * simplify.c (simplify_trig_call, degrees_f, radians_f,
> gfc_simplify_atrigd, gfc_simplify_cotan): Likewise.
>
Thanks for these- I thought I fixed all that stuff already, but I
guess I miffed it somewhere along the line.
...
>
> /* Resolve degree trig function as trigd (x) = trig (radians (x)). */
> --- gcc/fortran/simplify.c.jj 2016-10-11 20:51:01.767308095 +0200
> +++ gcc/fortran/simplify.c 2016-10-11 20:56:27.468199551 +0200
> @@ -1717,27 +1717,24 @@ simplify_trig_call (gfc_expr *icall)
>
> /* The actual simplifiers will return NULL for non-constant x. */
> switch (func)
> - {
> + {
...
> default:
> - break;
> - }
> -
> - gfc_internal_error ("in simplify_trig_call(): Bad intrinsic");
> - return NULL;
> + gfc_internal_error ("in simplify_trig_call(): Bad intrinsic");
> + }
> }
>
I only had a 'return NULL' so no compiler could complain that
"simplify_trig_call might not return a value". Your way is okay too if
it works.
Otherwise looks OK to me. Thanks again.
---
Fritz Reese
