From patchwork Thu Jan 12 13:43:38 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Vehreschild X-Patchwork-Id: 91153 Delivered-To: patch@linaro.org Received: by 10.182.3.34 with SMTP id 2csp1920578obz; Thu, 12 Jan 2017 05:44:22 -0800 (PST) X-Received: by 10.98.101.71 with SMTP id z68mr16556231pfb.165.1484228662752; Thu, 12 Jan 2017 05:44:22 -0800 (PST) Return-Path: Received: from sourceware.org (server1.sourceware.org. [209.132.180.131]) by mx.google.com with ESMTPS id x68si9298529pfa.269.2017.01.12.05.44.22 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Jan 2017 05:44:22 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-return-445963-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) client-ip=209.132.180.131; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org; spf=pass (google.com: domain of gcc-patches-return-445963-patch=linaro.org@gcc.gnu.org designates 209.132.180.131 as permitted sender) smtp.mailfrom=gcc-patches-return-445963-patch=linaro.org@gcc.gnu.org DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; q=dns; s= default; b=uHNlHHJ9gXPifc8c3x2PZKu3AwRNE6o8jhvOcuD6rshGzS+I2Tqd5 a14qSAqxJPLLf1Gu0G0jM1dDrIYww/BHcLM3EzkIuLupNjd0JuUwn2CkDk54WAMK bLFCCvGhGUcJIGKy3uJR+6ZPZWd+20JpPsgTAh9mfEaXmCwiujVXcg= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:subject:message-id:mime-version:content-type; s= default; bh=HMAnz2Q2ubiQpVL+o7ZTNYSc/as=; b=vb11tvSnlfZ2TwJaeu3d zx76jtFRtTXN3yM3ksJmR3PCXRY7VT62DUnnetTf3A0mDxAAHF/tXfx0JXCTnaii o0IhSOMvA4ysLTfh7JJaAjoGrGEKoPCTRQqRjMb0CXwZh9Avmwb03G5N7SBfD2iW eS2U3hQyMj7X5LRR1Rbv3V8= Received: (qmail 74041 invoked by alias); 12 Jan 2017 13:43:56 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 74007 invoked by uid 89); 12 Jan 2017 13:43:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.1 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_SORBS_SPAM, SPF_PASS autolearn=ham version=3.3.2 spammy=vehregccgnuorg, vehre@gcc.gnu.org, Hx-languages-length:1991, *code X-Spam-User: qpsmtpd, 2 recipients X-HELO: mout.gmx.net Received: from mout.gmx.net (HELO mout.gmx.net) (212.227.17.21) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 12 Jan 2017 13:43:45 +0000 Received: from vepi2 ([92.76.205.227]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LeRKD-1coPEv2wWb-00q9Xe; Thu, 12 Jan 2017 14:43:41 +0100 Date: Thu, 12 Jan 2017 14:43:38 +0100 From: Andre Vehreschild To: GCC-Patches-ML , GCC-Fortran-ML Subject: [PATCH, Fortran, pr70697, v1] [Coarray] ICE on EVENT WAIT with array element UNTIL_COUNT argument Message-ID: <20170112144338.24f93307@vepi2> MIME-Version: 1.0 X-UI-Out-Filterresults: notjunk:1; V01:K0:+KxZSdKnqbE=:QI9S7HfoAc8GVsYBSTJMCo ERbTa5Mgv4WiwPj/oTTjl71+pngTcjJOYgMqmkOwGBZr2n3Qfu62fbpBrxO7mGhtcpAuD0LXv Wu6XqkmLM+GiQOufaiQKZ2QsS07rOTVQ+nmvJQiVUDdrIJZN/r60eIpGCBpEeaYHdAm7viz+t ourY86RmWUZpgAJxDk8UiVddlgtN18jjhiQ2Pqjw6SBr0LTXcxDqDM2Jw1cf8t/uj+WD5ZM7a Dad3rdl3jaRDoL0vbdz/KiJ9r8Vz9e9125J7A5fq1d55ylY8n4B4a4H9oxsysC08aNWU1e7Cq PLNese+UpGVjsCXY4gPqI6+IJVstV+9j+c8WbVz0gYsgz9boWeZhUD6ikw1s2OdYeoF+HIROe HeMzu9PYRNmAMv9TQFFtV/HKt5I6Hj+gH33zWg7HwA/kwpWbJmv3XEd7m1DgFW6apMB02wWNE xeIFGp3khe30LPSTMJmod5L4EEZH8nA0h0pWDKsfXCUQzrXOW1GUF9LNOt27NIvMTplRHrqJ7 LvnzS6lZSzveRDmwNokgkFYWveGIB/DMOWn716fM/Ru6aSoGD/AndeAlsTFzuS35XOUXcMj18 +AqS9llTqj9C8cjYU9vQlFr6B2pmIzT5M6ulhmYKtc3oKlocQ9SaONrVt9xulMB1JRQWxE+TZ by9WnySYM+b1WmLIeCx+7GCa0ZsEDR/QoBkN+jN7/4PrL7mWh+6dd5zBityMvS9YNR+wywMKl jJIuEzbdOc8KKKBRNYi7LXBcIzrUW2UhzXQX0SO9Cr+XCMJpDJe2aQA8uBnu5aJj0/N4nDuzq hKHrACkrcq1OcELcm4Lqe8pNd/KW5RmD7otkx0di9jtfaEYNeaDLbQ6YfRgf/VT4b+X6c/Aom ssaGS2j2An5KzKBGMkXc6fOCWiF57GAHUi0JGiOBGJ99g1wejaLQqkv5qFFEJZj0ZoAPmfM0z +oLfnYonlRXii658zf8Za+izqv99mPU/Oazbl6Fm2LVhL0AzWao7Q7lTYUAD4QjA2YA2F/vDL JZenLZLS4FKZNd4W3bRQ6/tpOT32mOgOWcVnEg8dq13F Hi all, *** this is no duplicate, but +1 in the PR#! *** attached patch fixes the ICE by resolving the expression in UNTIL_COUNT correctly. The ICE was caused by the array-specification in UNTIL_COUNT not correctly set. Bootstraps and regtests ok on x86_64-linux/F25. Ok for trunk and gcc-6? - Andre -- Andre Vehreschild * Email: vehre ad gmx dot de gcc/testsuite/ChangeLog: 2017-01-12 Andre Vehreschild PR fortran/70697 * gfortran.dg/coarray/event_4.f08: New test. gcc/fortran/ChangeLog: 2017-01-12 Andre Vehreschild PR fortran/70697 * resolve.c (resolve_lock_unlock_event): Resolve the expression for event's until_count. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index a75d5fe..a5fe231 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -9158,10 +9158,13 @@ resolve_lock_unlock_event (gfc_code *code) return; /* Check for EVENT WAIT the UNTIL_COUNT. */ - if (code->op == EXEC_EVENT_WAIT && code->expr4 - && (code->expr4->ts.type != BT_INTEGER || code->expr4->rank != 0)) - gfc_error ("UNTIL_COUNT= argument at %L must be a scalar INTEGER " - "expression", &code->expr4->where); + if (code->op == EXEC_EVENT_WAIT && code->expr4) + { + if (!gfc_resolve_expr (code->expr4) || code->expr4->ts.type != BT_INTEGER + || code->expr4->rank != 0) + gfc_error ("UNTIL_COUNT= argument at %L must be a scalar INTEGER " + "expression", &code->expr4->where); + } } diff --git a/gcc/testsuite/gfortran.dg/coarray/event_4.f08 b/gcc/testsuite/gfortran.dg/coarray/event_4.f08 new file mode 100644 index 0000000..de901c0 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/coarray/event_4.f08 @@ -0,0 +1,12 @@ +! { dg-do run } +! +! Check that pr 70697 is fixed. + +program event_4 + use iso_fortran_env + integer :: nc(1) + type(event_type) done[*] + nc(1) = 1 + event post(done[1]) + event wait(done,until_count=nc(1)) +end