From patchwork Sun Oct 31 19:50:59 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernhard Reutner-Fischer X-Patchwork-Id: 1548879 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: bilbo.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=MUPZFgFf; dkim-atps=neutral Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by bilbo.ozlabs.org (Postfix) with ESMTPS id 4Hj6Hn1QfHz9t5K for ; Mon, 1 Nov 2021 06:51:47 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 33D973858015 for ; Sun, 31 Oct 2021 19:51:45 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 33D973858015 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1635709905; bh=JU/3rmU85Rv0lxyf+neYfq1k7zsds/GU8o1+3b6rMQI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=MUPZFgFfGnC84vL3WNuNJv6JIJ0qWjmFN7U1fjPPsbgRho/NTck6TG++EmBfDeUko ImCzISl4xPdFh/s9rZ9GR6Z3yjZGjRko59QXkkAOzUXrEhSCFyiwJz/s27wURp/pME 5OZ9s5Y5D4uebDqHcva1hXrdXwQ2jyDOrLJPMEbw= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x336.google.com (mail-wm1-x336.google.com [IPv6:2a00:1450:4864:20::336]) by sourceware.org (Postfix) with ESMTPS id 7DE913858420; Sun, 31 Oct 2021 19:51:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 7DE913858420 Received: by mail-wm1-x336.google.com with SMTP id 67-20020a1c1946000000b0030d4c90fa87so10490025wmz.2; Sun, 31 Oct 2021 12:51:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=JU/3rmU85Rv0lxyf+neYfq1k7zsds/GU8o1+3b6rMQI=; b=GCNInF0ZL3zPbFmhO0EcfX1Ra6StF7Kx+HHXSQUTDXxzVlUpQzP/IKVKRhqLTc1mzM XMZ89adFxOgYLImEd5qr6L+qZS2cK5ZGO2lGDvFz18c6v4v6BdFle4syJXpdQaZ+2U/B AuaK+b++jFGYsfcgcuQjFs3SdoylQPxbgQ0u/WCxJlxBneYEHaY0TfYEQrhy8g3IdSWS hoxoXFi/v+ki4gEwHnFTuMtsuiwvAkQItNjuojRN0X1mM8rQi+JDvJXVQ4IZKRTFHRK5 4C4g7+1tR7D4hmQqv/7aYkWxfCQfH1xKnUFMr4UsGaunjuTKy292sG6Usbztkru4U9HF ZUdQ== X-Gm-Message-State: AOAM531Ss+SK2MLpLBNy/cUwJfV58QYUUh4stresaiPUiKD0IeVPS7kZ m4LejUb+nSMj+gTgaG7LoDA= X-Google-Smtp-Source: ABdhPJz7+we36SU/7I1s0jEUvyHyjX/XPgjhMXmLhilSCuZChO2ecoZIQhIc8fgOGL1e74ZO6ASHOQ== X-Received: by 2002:a1c:2b04:: with SMTP id r4mr35908762wmr.48.1635709867541; Sun, 31 Oct 2021 12:51:07 -0700 (PDT) Received: from nbbrfq.weghof (dynamic-2bq7di4u2lfl4qjka9-pd01.res.v6.highway.a1.net. [2001:871:227:33a8:f6a3:c58c:7641:e771]) by smtp.gmail.com with ESMTPSA id m34sm10021976wms.25.2021.10.31.12.51.07 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 31 Oct 2021 12:51:07 -0700 (PDT) Received: from b by nbbrfq.weghof with local (Exim 4.95) (envelope-from ) id 1mhGrC-006TLM-9t; Sun, 31 Oct 2021 20:51:06 +0100 To: gcc-patches@gcc.gnu.org, fortran@gcc.gnu.org, Sandra Loosemore Subject: [PATCH] Fortran: Diagnose all operands with constraint violations [PR101337] Date: Sun, 31 Oct 2021 20:50:59 +0100 Message-Id: <20211031195059.1542754-1-rep.dot.nop@gmail.com> X-Mailer: git-send-email 2.33.0 MIME-Version: 1.0 X-Spam-Status: No, score=-10.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Bernhard Reutner-Fischer via Gcc-patches From: Bernhard Reutner-Fischer Reply-To: Bernhard Reutner-Fischer Cc: Bernhard Reutner-Fischer Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" From: Bernhard Reutner-Fischer PR fortran/101337 gcc/fortran/ChangeLog: * resolve.c (resolve_operator): Continue resolving on op2 error. --- The PR rightfully notes that we only diagnose the right operator and do not check the left operator if the right one was faulty. c407b-2 is one of the testcases with respective XFAILs. Since that testcase is rather big (and full of errors) i'm listing an abbreviated version here, including the output we'd generate with the attached patch. Note: I did not address the XFAILs! Sandra, please take over if you like the patch! Bootstrapped and regtested without new regressions (XFAILs are apparently ignored and not flagged if they are auto-fixed). As said, Sandra please take over, i'm deleting this locally. $ cat c407b-2-b.f90;echo EOF; gfortran -c c407b-2-b.f90 subroutine s2 (x, y) implicit none type(*) :: x, y integer :: i ! relational operations if (x & ! { dg-error "Assumed.type" "pr101337, failure to diagnose both operands" { xfail *-*-*} } .eq. y) then ! { dg-error "Assumed.type" } return end if if (.not. (x & ! { dg-error "Assumed.type" "pr101337, failure to diagnose both operands" { xfail *-*-*} } .ne. y)) then ! { dg-error "Assumed.type" } return end if i = (x & ! { dg-error "Assumed.type" "pr101337, failure to diagnose both operands" { xfail *-*-*} } + y) ! { dg-error "Assumed.type" } end subroutine EOF c407b-2-b.f90:8:10: 8 | .eq. y) then ! { dg-error "Assumed.type" } | 1 Error: Assumed-type variable y at (1) may only be used as actual argument c407b-2-b.f90:7:6: 7 | if (x & ! { dg-error "Assumed.type" "pr101337, failure to diagnose both operands" { xfail *-*-*} } | 1 Error: Assumed-type variable x at (1) may only be used as actual argument c407b-2-b.f90:12:17: 12 | .ne. y)) then ! { dg-error "Assumed.type" } | 1 Error: Assumed-type variable y at (1) may only be used as actual argument c407b-2-b.f90:11:13: 11 | if (.not. (x & ! { dg-error "Assumed.type" "pr101337, failure to diagnose both operands" { xfail *-*-*} } | 1 Error: Assumed-type variable x at (1) may only be used as actual argument c407b-2-b.f90:16:10: 16 | + y) ! { dg-error "Assumed.type" } | 1 Error: Assumed-type variable y at (1) may only be used as actual argument c407b-2-b.f90:15:7: 15 | i = (x & ! { dg-error "Assumed.type" "pr101337, failure to diagnose both operands" { xfail *-*-*} } | 1 Error: Assumed-type variable x at (1) may only be used as actual argument --- gcc/fortran/resolve.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 1f4abd08720..705d2326a29 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4064,7 +4064,7 @@ resolve_operator (gfc_expr *e) { default: if (!gfc_resolve_expr (e->value.op.op2)) - return false; + t = false; /* Fall through. */ @@ -4091,6 +4091,9 @@ resolve_operator (gfc_expr *e) op2 = e->value.op.op2; if (op1 == NULL && op2 == NULL) return false; + /* Error out if op2 did not resolve. We already diagnosed op1. */ + if (t == false) + return false; dual_locus_error = false;