From f31c1cf92148897a5f59b6f34837d8ee151189e9 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 15:09:21 +0000 Subject: [PATCH 1/9] Removed commented out section for GNU submission --- gcc/fortran/match.c | 5 ----- 1 file changed, 5 deletions(-) diff --git a/gcc/fortran/match.c b/gcc/fortran/match.c index fb20bcd1a3a78..fc2c561e2973b 100644 --- a/gcc/fortran/match.c +++ b/gcc/fortran/match.c @@ -3401,11 +3401,6 @@ gfc_match_change_team (void) new_st.op = EXEC_CHANGE_TEAM; - /* if (gfc_match ("%e", &teamid) != MATCH_YES) */ - /* goto syntax; */ - /* m = gfc_match_char (','); */ - /* if (m == MATCH_ERROR) */ - /* goto syntax; */ if (gfc_match ("%e", &team) != MATCH_YES) goto syntax; From 1223250b317be398dbb9f992aba4f6e3a937b646 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 17:47:39 +0000 Subject: [PATCH 2/9] removed src_team since during gcc build I was getting a unused variable warning-as-errors error --- gcc/fortran/trans-intrinsic.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 0e3e3860fdbc3..31ef518b09497 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -1852,7 +1852,7 @@ conv_caf_send (gfc_code *code) { gfc_se lhs_se, rhs_se; stmtblock_t block; tree caf_decl, token, offset, image_index, tmp, lhs_kind, rhs_kind; - tree may_require_tmp, src_stat, dst_stat, dst_team, src_team; + tree may_require_tmp, src_stat, dst_stat, dst_team; tree lhs_type = NULL_TREE; tree vec = null_pointer_node, rhs_vec = null_pointer_node; symbol_attribute lhs_caf_attr, rhs_caf_attr; @@ -1868,7 +1868,7 @@ conv_caf_send (gfc_code *code) { lhs_caf_attr = gfc_caf_attr (lhs_expr); rhs_caf_attr = gfc_caf_attr (rhs_expr); src_stat = dst_stat = null_pointer_node; - src_team = dst_team = null_pointer_node; + dst_team = null_pointer_node; /* LHS. */ gfc_init_se (&lhs_se, NULL); From 30afe80570e570196833df22921a83d7c2443097 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 18:11:21 +0000 Subject: [PATCH 3/9] Formatting changes, spaces between function call and parentheses --- gcc/fortran/array.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index dc1d272dd0af0..fd2a8c63e5941 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -234,7 +234,7 @@ gfc_match_array_ref (gfc_array_ref *ar, gfc_array_spec *as, int init, team_just_seen = false; stat_just_seen = false; - if (gfc_match(" , team = %e",&tmp) == MATCH_YES && ar->stat == NULL) + if (gfc_match (" , team = %e", &tmp) == MATCH_YES && ar->stat == NULL) { ar->team = tmp; team_just_seen = true; @@ -246,7 +246,7 @@ gfc_match_array_ref (gfc_array_ref *ar, gfc_array_spec *as, int init, return MATCH_ERROR; } - if (gfc_match(" , stat = %e",&tmp) == MATCH_YES && ar->stat == NULL) + if (gfc_match (" , stat = %e",&tmp) == MATCH_YES && ar->stat == NULL) { ar->stat = tmp; stat_just_seen = true; From dae2f8eb76597c5d9fcc857c01f7fdf35ec4d614 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 18:16:58 +0000 Subject: [PATCH 4/9] Formatting changes, spaces between function call and parentheses --- gcc/fortran/expr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 05b0b8286f09e..c43afaa05d320 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4975,7 +4975,7 @@ gfc_ref_this_image (gfc_ref *ref) } gfc_expr * -gfc_find_team_co(gfc_expr *e) +gfc_find_team_co (gfc_expr *e) { gfc_ref *ref; @@ -4993,7 +4993,7 @@ gfc_find_team_co(gfc_expr *e) } gfc_expr * -gfc_find_stat_co(gfc_expr *e) +gfc_find_stat_co (gfc_expr *e) { gfc_ref *ref; From 8473abb37bd8bc9a34b7b3139ce779549f5246a3 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 18:25:40 +0000 Subject: [PATCH 5/9] GNU formatting changes --- gcc/fortran/intrinsic.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c index a2bb0d97a20e9..47970e6bbb729 100644 --- a/gcc/fortran/intrinsic.c +++ b/gcc/fortran/intrinsic.c @@ -1940,9 +1940,7 @@ add_functions (void) add_sym_1 ("get_team", GFC_ISYM_GET_TEAM, CLASS_TRANSFORMATIONAL, ACTUAL_NO, BT_INTEGER, di, GFC_STD_F2008_TS, - gfc_check_get_team, - NULL, - gfc_resolve_get_team, + gfc_check_get_team, NULL, gfc_resolve_get_team, "level", BT_INTEGER, di, OPTIONAL); add_sym_0 ("getuid", GFC_ISYM_GETUID, CLASS_IMPURE, ACTUAL_NO, BT_INTEGER, From f54c1d630f265b9f608a29430d4afc23f456a28d Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 18:50:35 +0000 Subject: [PATCH 6/9] GNU formatting standard fixes --- gcc/fortran/trans-decl.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index e0ff9e40abae6..d67119cfabd6b 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -3363,7 +3363,7 @@ gfc_build_intrinsic_function_decls (void) jtype = gfc_get_int_type (ikinds[jkind]); if (itype && jtype) { - sprintf(name, PREFIX("pow_i%d_i%d"), ikinds[ikind], + sprintf (name, PREFIX("pow_i%d_i%d"), ikinds[ikind], ikinds[jkind]); gfor_fndecl_math_powi[jkind][ikind].integer = gfc_build_library_function_decl (get_identifier (name), @@ -3378,7 +3378,7 @@ gfc_build_intrinsic_function_decls (void) rtype = gfc_get_real_type (rkinds[rkind]); if (rtype && itype) { - sprintf(name, PREFIX("pow_r%d_i%d"), rkinds[rkind], + sprintf (name, PREFIX("pow_r%d_i%d"), rkinds[rkind], ikinds[ikind]); gfor_fndecl_math_powi[rkind][ikind].real = gfc_build_library_function_decl (get_identifier (name), @@ -3390,7 +3390,7 @@ gfc_build_intrinsic_function_decls (void) ctype = gfc_get_complex_type (rkinds[rkind]); if (ctype && itype) { - sprintf(name, PREFIX("pow_c%d_i%d"), rkinds[rkind], + sprintf (name, PREFIX("pow_c%d_i%d"), rkinds[rkind], ikinds[ikind]); gfor_fndecl_math_powi[rkind][ikind].cmplx = gfc_build_library_function_decl (get_identifier (name), From 13913ac4adcec0008247a785b3fd139a3e79514a Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 19:11:14 +0000 Subject: [PATCH 7/9] GNU formatting standard, space between func call and paren --- gcc/fortran/trans-intrinsic.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 31ef518b09497..485520103274e 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -853,7 +853,7 @@ gfc_conv_intrinsic_lib_function (gfc_se * se, gfc_expr * expr) if (m->id == GFC_ISYM_NONE) { - printf("Id %d none %d\n",id,GFC_ISYM_NONE); + printf ("Id %d none %d\n",id,GFC_ISYM_NONE); gfc_internal_error ("Intrinsic function %qs (%d) not recognized", expr->value.function.name, id); } From fd0133fc28b0eab4a4020273a6c55a1228a50556 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Sat, 11 Nov 2017 19:28:38 +0000 Subject: [PATCH 8/9] GNU formating and removed commented out code section --- gcc/fortran/trans-stmt.c | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c index 3de9124f19a3d..c979c885da743 100644 --- a/gcc/fortran/trans-stmt.c +++ b/gcc/fortran/trans-stmt.c @@ -735,16 +735,13 @@ gfc_trans_change_team (gfc_code *code) { gfc_se argse; tree team_type; - /* gfc_init_se (&argse, NULL); */ - /* gfc_conv_expr_val (&argse, code->expr1); */ - /* team_id = fold_convert (integer_type_node, argse.expr); */ + gfc_init_se (&argse, NULL); gfc_conv_expr_val (&argse, code->expr1); team_type = gfc_build_addr_expr (ppvoid_type_node, argse.expr); return build_call_expr_loc (input_location, - gfor_fndecl_caf_change_team, 2, - team_type, + gfor_fndecl_caf_change_team, 2, team_type, build_int_cst (integer_type_node, 0)); } else @@ -785,9 +782,7 @@ gfc_trans_sync_team (gfc_code *code) { gfc_se argse; tree team_type; - /* gfc_init_se (&argse, NULL); */ - /* gfc_conv_expr_val (&argse, code->expr1); */ - /* team_id = fold_convert (integer_type_node, argse.expr); */ + gfc_init_se (&argse, NULL); gfc_conv_expr_val (&argse, code->expr1); team_type = gfc_build_addr_expr (ppvoid_type_node, argse.expr); From 7c3627b45a94b02116fd1ece37c994a841766f18 Mon Sep 17 00:00:00 2001 From: Soren Rasmussen Date: Mon, 13 Nov 2017 09:47:47 +0000 Subject: [PATCH 9/9] removed print statement left over from developement --- gcc/fortran/trans-intrinsic.c | 1 - 1 file changed, 1 deletion(-) diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 485520103274e..b76003f5aa66f 100644 --- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -853,7 +853,6 @@ gfc_conv_intrinsic_lib_function (gfc_se * se, gfc_expr * expr) if (m->id == GFC_ISYM_NONE) { - printf ("Id %d none %d\n",id,GFC_ISYM_NONE); gfc_internal_error ("Intrinsic function %qs (%d) not recognized", expr->value.function.name, id); }