diff options
author | David Malcolm <dmalcolm@redhat.com> | 2015-05-05 19:41:11 +0000 |
---|---|---|
committer | David Malcolm <dmalcolm@gcc.gnu.org> | 2015-05-05 19:41:11 +0000 |
commit | 21c0a521e4c1059b59ec2f15fad7469134126d7c (patch) | |
tree | 3c03b0fd133a40ad4cd1831ee497ff3193b7a8e9 /gcc/fortran | |
parent | 0674c9de9d16a62fd3bb17c10c65adf7899043d6 (diff) | |
download | gcc-21c0a521e4c1059b59ec2f15fad7469134126d7c.zip gcc-21c0a521e4c1059b59ec2f15fad7469134126d7c.tar.gz gcc-21c0a521e4c1059b59ec2f15fad7469134126d7c.tar.bz2 |
Fix indentation issues seen by -Wmisleading-indentation
gcc/ChangeLog:
* auto-profile.c (afdo_find_equiv_class): Fix indentation so
that it reflects the block structure.
(afdo_propagate_edge): Likewise.
(afdo_calculate_branch_prob): Likewise.
(afdo_annotate_cfg): Likewise.
* cfgcleanup.c (equal_different_set_p): Likewise.
(try_crossjump_to_edge): Likewise.
* cgraph.c (cgraph_node::verify_node): Likewise.
* cgraphunit.c (expand_all_functions): Likewise.
* config/i386/i386.c (ix86_expand_copysign): Likewise.
(exact_dependency_1): Likewise.
* dwarf2asm.c (dw2_output_indirect_constants): Likewise.
* dwarf2out.c (tree_add_const_value_attribute_for_decl): Likewise.
* gensupport.c (process_define_subst): Likewise.
* lto-wrapper.c (merge_and_complain): Likewise.
* tree-if-conv.c (if_convertible_bb_p): Likewise.
* tree-ssa-loop-prefetch.c (find_or_create_group): Likewise.
* tree-ssa-tail-merge.c (gsi_advance_fw_nondebug_nonlocal): Likewise.
* tree-vect-data-refs.c (vect_grouped_load_supported): Likewise.
* tree-vect-loop.c (vectorizable_reduction): Likewise.
* tree-vect-slp.c (vect_transform_slp_perm_load): Likewise.
* tree-vect-stmts.c (vectorizable_shift): Likewise.
* tree-vrp.c (vrp_finalize): Likewise.
* tree.c (variably_modified_type_p): Likewise.
gcc/cp/ChangeLog:
* parser.c (cp_parser_asm_definition): Only test for
error_mark_node if "outputs" was just set.
(cp_parser_asm_definition): Likewise for "inputs".
gcc/fortran/ChangeLog:
* expr.c (check_inquiry): Fix indentation so that it reflects the
block structure.
* interface.c (compare_parameter): Likewise.
* parse.c (parse_oacc_structured_block): Likewise.
* target-memory.c (expr_to_char): Likewise.
* trans-types.c (gfc_init_kinds): Likewise.
libcpp/ChangeLog:
* pch.c (cpp_valid_state): Fix indentation so that it reflects the
block structure.
From-SVN: r222823
Diffstat (limited to 'gcc/fortran')
-rw-r--r-- | gcc/fortran/ChangeLog | 9 | ||||
-rw-r--r-- | gcc/fortran/expr.c | 4 | ||||
-rw-r--r-- | gcc/fortran/interface.c | 2 | ||||
-rw-r--r-- | gcc/fortran/parse.c | 2 | ||||
-rw-r--r-- | gcc/fortran/target-memory.c | 4 | ||||
-rw-r--r-- | gcc/fortran/trans-types.c | 12 |
6 files changed, 21 insertions, 12 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index f98c2fb..67f9e09 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2015-05-05 David Malcolm <dmalcolm@redhat.com> + + * expr.c (check_inquiry): Fix indentation so that it reflects the + block structure. + * interface.c (compare_parameter): Likewise. + * parse.c (parse_oacc_structured_block): Likewise. + * target-memory.c (expr_to_char): Likewise. + * trans-types.c (gfc_init_kinds): Likewise. + 2015-05-02 Steven G. Kargl <kargl@gcc.gnu.org> PR fortran/65976 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 7f3a59d..c34be90 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2297,8 +2297,8 @@ check_inquiry (gfc_expr *e, int not_restricted) if (strcmp (functions[i], name) == 0) break; - if (functions[i] == NULL) - return MATCH_ERROR; + if (functions[i] == NULL) + return MATCH_ERROR; } /* At this point we have an inquiry function with a variable argument. The diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index d4c2629..0501c1d 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -2180,7 +2180,7 @@ compare_parameter (gfc_symbol *formal, gfc_expr *actual, gfc_error ("Passing coarray at %L to allocatable, noncoarray, " "INTENT(OUT) dummy argument %qs", &actual->where, formal->name); - return 0; + return 0; } else if (warn_surprising && where && formal->attr.intent != INTENT_IN) gfc_warning (OPT_Wsurprising, diff --git a/gcc/fortran/parse.c b/gcc/fortran/parse.c index 2c7c554..30e4eab 100644 --- a/gcc/fortran/parse.c +++ b/gcc/fortran/parse.c @@ -4283,7 +4283,7 @@ parse_oacc_structured_block (gfc_statement acc_st) unexpected_eof (); else if (st != acc_end_st) gfc_error ("Expecting %s at %C", gfc_ascii_statement (acc_end_st)); - reject_statement (); + reject_statement (); } while (st != acc_end_st); diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c index 4d63636..187682a 100644 --- a/gcc/fortran/target-memory.c +++ b/gcc/fortran/target-memory.c @@ -671,8 +671,8 @@ expr_to_char (gfc_expr *e, unsigned char *data, unsigned char *chk, size_t len) gcc_assert (cmp && cmp->backend_decl); if (!c->expr) continue; - ptr = TREE_INT_CST_LOW(DECL_FIELD_OFFSET(cmp->backend_decl)) - + TREE_INT_CST_LOW(DECL_FIELD_BIT_OFFSET(cmp->backend_decl))/8; + ptr = TREE_INT_CST_LOW(DECL_FIELD_OFFSET(cmp->backend_decl)) + + TREE_INT_CST_LOW(DECL_FIELD_BIT_OFFSET(cmp->backend_decl))/8; expr_to_char (c->expr, &data[ptr], &chk[ptr], len); } return len; diff --git a/gcc/fortran/trans-types.c b/gcc/fortran/trans-types.c index 2533478..c8be256 100644 --- a/gcc/fortran/trans-types.c +++ b/gcc/fortran/trans-types.c @@ -438,10 +438,10 @@ gfc_init_kinds (void) /* Only let float, double, long double and __float128 go through. Runtime support for others is not provided, so they would be useless. */ - if (!targetm.libgcc_floating_mode_supported_p ((machine_mode) + if (!targetm.libgcc_floating_mode_supported_p ((machine_mode) mode)) - continue; - if (mode != TYPE_MODE (float_type_node) + continue; + if (mode != TYPE_MODE (float_type_node) && (mode != TYPE_MODE (double_type_node)) && (mode != TYPE_MODE (long_double_type_node)) #if defined(HAVE_TFmode) && defined(ENABLE_LIBQUADMATH_SUPPORT) @@ -587,7 +587,7 @@ gfc_init_kinds (void) gfc_fatal_error ("REAL(KIND=4) is not available for " "%<-freal-8-real-4%> option"); - gfc_default_double_kind = 4; + gfc_default_double_kind = 4; } else if (flag_real8_kind == 10 ) { @@ -595,7 +595,7 @@ gfc_init_kinds (void) gfc_fatal_error ("REAL(KIND=10) is not available for " "%<-freal-8-real-10%> option"); - gfc_default_double_kind = 10; + gfc_default_double_kind = 10; } else if (flag_real8_kind == 16 ) { @@ -603,7 +603,7 @@ gfc_init_kinds (void) gfc_fatal_error ("REAL(KIND=10) is not available for " "%<-freal-8-real-16%> option"); - gfc_default_double_kind = 16; + gfc_default_double_kind = 16; } else if (saw_r4 && saw_r8) gfc_default_double_kind = 8; |