From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from esa1.mentor.iphmx.com (esa1.mentor.iphmx.com [68.232.129.153]) by sourceware.org (Postfix) with ESMTPS id 5862F3858023; Fri, 30 Jun 2023 19:24:22 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5862F3858023 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=codesourcery.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mentor.com X-IronPort-AV: E=Sophos;i="6.01,171,1684828800"; d="scan'208";a="11765207" Received: from orw-gwy-02-in.mentorg.com ([192.94.38.167]) by esa1.mentor.iphmx.com with ESMTP; 30 Jun 2023 11:24:21 -0800 IronPort-SDR: yxbqFl3MoYQUf+YhFR9J/31YFpg6KFSZeA+ESWpL8I2IS9O6QOTCmGu39E+16AugmR2aPqsEwZ EWWY8c2G3UEmzm3N4RR23faHBsW5YFOqwU1iaRjIvGLTBgw+K/J+/9xpNDEhxtci3Gr7Ar8YrB ut5MtB+qNdT9JVIfGDXHPclNO9lT1Aq7MDAPFFRPfiKkGdQ+CQOO5nLiElRud9x1ZL2UlnIQ/M xOLi7CShA9oDPaLe5CaYFwr9/D9xRqp283toPgZ7axE5CqSCL7aVRkl3/ctmXR9NgfQvD178hU oig= From: Julian Brown To: CC: , Tobias Burnus , Subject: [PATCH 1/7] Fix up merge/formatting errors Date: Fri, 30 Jun 2023 19:23:28 +0000 Message-ID: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [137.202.0.90] X-ClientProxiedBy: svr-ies-mbx-13.mgc.mentorg.com (139.181.222.13) To svr-ies-mbx-11.mgc.mentorg.com (139.181.222.11) X-Spam-Status: No, score=-11.8 required=5.0 tests=BAYES_00,GIT_PATCH_0,HEADER_FROM_DIFFERENT_DOMAINS,KAM_DMARC_STATUS,SPF_HELO_PASS,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This patch fixes a couple of minor merge/formatting errors. 2023-06-30 Julian Brown gcc/fortran/ * parse.cc (decode_omp_directive): Add missing break. gcc/ * gimplify.cc (gimplify_adjust_omp_clauses): Fix indentation. --- gcc/fortran/parse.cc | 1 + gcc/gimplify.cc | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/gcc/fortran/parse.cc b/gcc/fortran/parse.cc index 73f15608260..2467adf5836 100644 --- a/gcc/fortran/parse.cc +++ b/gcc/fortran/parse.cc @@ -902,6 +902,7 @@ decode_omp_directive (void) break; case 't': matchs ("tile sizes", gfc_match_omp_tile, ST_OMP_TILE); + break; case 'u': matchs ("unroll", gfc_match_omp_unroll, ST_OMP_UNROLL); break; diff --git a/gcc/gimplify.cc b/gcc/gimplify.cc index 1e90d2ed031..707a0c046de 100644 --- a/gcc/gimplify.cc +++ b/gcc/gimplify.cc @@ -13996,8 +13996,8 @@ gimplify_adjust_omp_clauses (gimple_seq *pre_p, gimple_seq body, tree *list_p, fb_lvalue) == GS_ERROR) remove = true; gimplify_omp_ctxp = ctx; - break; - } + break; + } if ((code == OMP_TARGET || code == OMP_TARGET_DATA -- 2.25.1