From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9646 invoked by alias); 11 Jun 2018 15:05:22 -0000 Mailing-List: contact fortran-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: fortran-owner@gcc.gnu.org Received: (qmail 9141 invoked by uid 89); 11 Jun 2018 15:05:21 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-10.8 required=5.0 tests=AWL,BAYES_00,FREEMAIL_ENVFROM_END_DIGIT,FREEMAIL_FROM,GIT_PATCH_2,GIT_PATCH_3,RCVD_IN_DNSWL_NONE,SPF_PASS autolearn=ham version=3.3.2 spammy=correspondence, tstype, UD:ts.type, UD:type X-Spam-User: qpsmtpd, 2 recipients X-HELO: mail-yw0-f170.google.com Received: from mail-yw0-f170.google.com (HELO mail-yw0-f170.google.com) (209.85.161.170) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 11 Jun 2018 15:05:20 +0000 Received: by mail-yw0-f170.google.com with SMTP id q7-v6so6404896ywd.9; Mon, 11 Jun 2018 08:05:20 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:sender:from:date:message-id:subject :to; bh=GhJbQ+ZzUGKOy4ueIS7PUuuPUM8c9PzAgNc5W6SzDac=; b=XC87uUmqJ4ewIcyLMsZPHiVJ48S/Y4Wl+oYewv4EQYCBLKKTZdHkH5xiMYQOo0Jn+r seH14v1i/IIbSlx7vC75Q/7SuswzGDNrDwkAq4RDs445pA2sf4X3olS/vaWxiBb7iT3s DoFcUsixnOz2sA+A6+I8kNfN42kgYTcCzEvgJYGNgkwJw8BaonxuUGI4P7tkWXwWO6oY VxgqeWsz07UNlvClorodGnFh0hfbJ9jOPyX2V4ejIC50J0RLhKGD9J7CJU4p613UvEQc zbHznlbqZkUOotpCoP9UZs4pfyGkMXVEtsrc05ZGP6PJ1eFDSyFPBDDkLFtpe9Q1Gs7c xa9w== X-Gm-Message-State: APt69E0ainu67RxpF0VgXeBHObFwcV0wUR8WWjh7yWRuDWFhYYAERpwx GakpKgzMlHTuLseBLFTG3q2aeBbLx7cws6xW0Q3W9g== X-Google-Smtp-Source: ADUXVKIE+zqHMi7w/q7oMcuh+fIk/Wnj7vrdQLlrkHYLXZI5oYbsilzCgpUrJ/EYnSUpgPi7LxIYn+nRjbCrKHJU6Lg= X-Received: by 2002:a81:5590:: with SMTP id j138-v6mr10108286ywb.310.1528729518467; Mon, 11 Jun 2018 08:05:18 -0700 (PDT) MIME-Version: 1.0 Received: by 2002:a81:71d4:0:0:0:0:0 with HTTP; Mon, 11 Jun 2018 08:05:17 -0700 (PDT) From: Janus Weil Date: Mon, 11 Jun 2018 15:24:00 -0000 Message-ID: Subject: [Patch, Fortran, F08] PR 45521: GENERIC resolution with ALLOCATABLE/POINTER and PROCEDURE To: gfortran , gcc-patches Content-Type: multipart/mixed; boundary="000000000000e81544056e5f1388" X-IsSubscribed: yes X-SW-Source: 2018-06/txt/msg00058.txt.bz2 --000000000000e81544056e5f1388 Content-Type: text/plain; charset="UTF-8" Content-length: 699 Hi all, the attached patch fixes two remaining problems with the resolution of generic functions with POINTER and ALLOCATABLE arguments in F08 (coments 16 & 17 in the PR): * it deals with an INTENT(IN) condition that was added in an IR * it deals with polymorphic arguments, which were mistreated previously. The patch regtests cleanly on x86_64-linux-gnu. Ok for trunk? Cheers, Janus 2018-06-11 Janus Weil PR fortran/45521 * interface.c (compare_ptr_alloc): New function. (compare_ptr_alloc): Call it. 2018-06-11 Janus Weil PR fortran/45521 * gfortran.dg/generic_32.f90: New test. * gfortran.dg/generic_33.f90: New test. --000000000000e81544056e5f1388 Content-Type: text/x-patch; charset="US-ASCII"; name="pr45521.diff" Content-Disposition: attachment; filename="pr45521.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jiae23930 Content-length: 2758 SW5kZXg6IGdjYy9mb3J0cmFuL2ludGVyZmFjZS5jCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIGdjYy9mb3J0cmFuL2ludGVyZmFjZS5jCShyZXZpc2lv biAyNjEzOTMpCisrKyBnY2MvZm9ydHJhbi9pbnRlcmZhY2UuYwkod29ya2lu ZyBjb3B5KQpAQCAtMTE5MCw2ICsxMTkwLDI0IEBACiB9CiAKIAorLyogUmV0 dXJucyB0cnVlIGlmIHR3byBkdW1teSBhcmd1bWVudHMgYXJlIGRpc3Rpbmd1 aXNoYWJsZSBkdWUgdG8gdGhlaXIgUE9JTlRFUgorICAgYW5kIEFMTE9DQVRB QkxFIGF0dHJpYnV0ZXMgYWNjb3JkaW5nIHRvIEYyMDE4IHNlY3Rpb24gMTUu NC4zLjQuNSAoMykuCisgICBUaGUgZnVuY3Rpb24gaXMgYXN5bW1ldHJpYyB3 cnQgdG8gdGhlIGFyZ3VtZW50cyBzMSBhbmQgczIgYW5kIHNob3VsZCBhbHdh eXMKKyAgIGJlIGNhbGxlZCB0d2ljZSAod2l0aCBmbGlwcGVkIGFyZ3VtZW50 cyBpbiB0aGUgc2Vjb25kIGNhbGwpLiAgKi8KKworc3RhdGljIGJvb2wKK2Nv bXBhcmVfcHRyX2FsbG9jKGdmY19zeW1ib2wgKnMxLCBnZmNfc3ltYm9sICpz MikKK3sKKyAgLyogSXMgczEgYWxsb2NhdGFibGU/ICAqLworICBjb25zdCBi b29sIGExID0gczEtPnRzLnR5cGUgPT0gQlRfQ0xBU1MgPworCQkgIENMQVNT X0RBVEEoczEpLT5hdHRyLmFsbG9jYXRhYmxlIDogczEtPmF0dHIuYWxsb2Nh dGFibGU7CisgIC8qIElzIHMyIGEgcG9pbnRlcj8gICovCisgIGNvbnN0IGJv b2wgcDIgPSBzMi0+dHMudHlwZSA9PSBCVF9DTEFTUyA/CisJCSAgQ0xBU1Nf REFUQShzMiktPmF0dHIuY2xhc3NfcG9pbnRlciA6IHMyLT5hdHRyLnBvaW50 ZXI7CisgIHJldHVybiBhMSAmJiBwMiAmJiAoczItPmF0dHIuaW50ZW50ICE9 IElOVEVOVF9JTik7Cit9CisKKwogLyogUGVyZm9ybSB0aGUgY29ycmVzcG9u ZGVuY2UgdGVzdCBpbiBydWxlICgzKSBvZiBGMDg6QzEyMTUuCiAgICBSZXR1 cm5zIHplcm8gaWYgbm8gYXJndW1lbnQgaXMgZm91bmQgdGhhdCBzYXRpc2Zp ZXMgdGhpcyBydWxlLAogICAgbm9uemVybyBvdGhlcndpc2UuICdwMScgYW5k ICdwMicgYXJlIHRoZSBQQVNTIGFyZ3VtZW50cyBvZiBib3RoIHByb2NlZHVy ZXMKQEAgLTEyMzMsOCArMTI1MSw4IEBACiAgICAgICBpZiAoZjIgIT0gTlVM TCAmJiAoY29tcGFyZV90eXBlX3JhbmsgKGYxLT5zeW0sIGYyLT5zeW0pCiAJ CQkgfHwgY29tcGFyZV90eXBlX3JhbmsgKGYyLT5zeW0sIGYxLT5zeW0pKQog CSAgJiYgISgoZ2ZjX29wdGlvbi5hbGxvd19zdGQgJiBHRkNfU1REX0YyMDA4 KQotCSAgICAgICAmJiAoKGYxLT5zeW0tPmF0dHIuYWxsb2NhdGFibGUgJiYg ZjItPnN5bS0+YXR0ci5wb2ludGVyKQotCQkgICB8fCAoZjItPnN5bS0+YXR0 ci5hbGxvY2F0YWJsZSAmJiBmMS0+c3ltLT5hdHRyLnBvaW50ZXIpKSkpCisJ ICAgICAgICYmIChjb21wYXJlX3B0cl9hbGxvYyhmMS0+c3ltLCBmMi0+c3lt KQorCQkgICB8fCBjb21wYXJlX3B0cl9hbGxvYyhmMi0+c3ltLCBmMS0+c3lt KSkpKQogCWdvdG8gbmV4dDsKIAogICAgICAgLyogTm93IHNlYXJjaCBmb3Ig YSBkaXNhbWJpZ3VhdGluZyBrZXl3b3JkIGFyZ3VtZW50IHN0YXJ0aW5nIGF0 CkBAIC0xMjQ3LDggKzEyNjUsOCBAQAogCSAgc3ltID0gZmluZF9rZXl3b3Jk X2FyZyAoZy0+c3ltLT5uYW1lLCBmMl9zYXZlKTsKIAkgIGlmIChzeW0gPT0g TlVMTCB8fCAhY29tcGFyZV90eXBlX3JhbmsgKGctPnN5bSwgc3ltKQogCSAg ICAgIHx8ICgoZ2ZjX29wdGlvbi5hbGxvd19zdGQgJiBHRkNfU1REX0YyMDA4 KQotCQkgICYmICgoc3ltLT5hdHRyLmFsbG9jYXRhYmxlICYmIGctPnN5bS0+ YXR0ci5wb2ludGVyKQotCQkgICAgICB8fCAoc3ltLT5hdHRyLnBvaW50ZXIg JiYgZy0+c3ltLT5hdHRyLmFsbG9jYXRhYmxlKSkpKQorCQkgICYmIChjb21w YXJlX3B0cl9hbGxvYyhzeW0sIGctPnN5bSkKKwkJICAgICAgfHwgY29tcGFy ZV9wdHJfYWxsb2MoZy0+c3ltLCBzeW0pKSkpCiAJICAgIHJldHVybiB0cnVl OwogCX0KIAo= --000000000000e81544056e5f1388 Content-Type: text/x-fortran; charset="US-ASCII"; name="generic_32.f90" Content-Disposition: attachment; filename="generic_32.f90" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jiae2m4r1 Content-length: 570 ISB7IGRnLWRvIGNvbXBpbGUgfQohCiEgUFIgNDU1MjE6IFtGMDhdIEdFTkVS SUMgcmVzb2x1dGlvbiB3aXRoIEFMTE9DQVRBQkxFL1BPSU5URVIgYW5kIFBS T0NFRFVSRQohCiEgQ29udHJpYnV0ZWQgYnkgSmFudXMgV2VpbCA8amFudXNA Z2NjLmdudS5vcmc+CgoKICBJTlRFUkZBQ0UgZ2VuCiAgICBTVUJST1VUSU5F IHN1YmEoYSkgICAhIHsgZGctZXJyb3IgIkFtYmlndW91cyBpbnRlcmZhY2Vz IiB9CiAgICAgIFJFQUwsQUxMT0NBVEFCTEUgOjogYSg6KQogICAgRU5EIFNV QlJPVVRJTkUKICAgIFNVQlJPVVRJTkUgc3VicChwKSAgICEgeyBkZy1lcnJv ciAiQW1iaWd1b3VzIGludGVyZmFjZXMiIH0KICAgICAgUkVBTCxQT0lOVEVS LElOVEVOVChJTikgOjogcCg6KQogICAgRU5EIFNVQlJPVVRJTkUKICBFTkQg SU5URVJGQUNFCmVuZAo= --000000000000e81544056e5f1388 Content-Type: text/x-fortran; charset="US-ASCII"; name="generic_33.f90" Content-Disposition: attachment; filename="generic_33.f90" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jiae2m5d2 Content-length: 643 ISB7IGRnLWRvIGNvbXBpbGUgfQohCiEgUFIgNDU1MjE6IFtGMDhdIEdFTkVS SUMgcmVzb2x1dGlvbiB3aXRoIEFMTE9DQVRBQkxFL1BPSU5URVIgYW5kIFBS T0NFRFVSRQohCiEgQ29udHJpYnV0ZWQgYnkgSmFudXMgV2VpbCA8amFudXNA Z2NjLmdudS5vcmc+CgogIHR5cGUgOjogdAogIGVuZCB0eXBlCgogIGludGVy ZmFjZSB0ZXN0CiAgICBwcm9jZWR1cmUgdGVzdEFsbG9jCiAgICBwcm9jZWR1 cmUgdGVzdFB0cgogIGVuZCBpbnRlcmZhY2UKCmNvbnRhaW5zCgogIGxvZ2lj YWwgZnVuY3Rpb24gdGVzdEFsbG9jKG9iaikKICAgIGNsYXNzKHQpLCBhbGxv Y2F0YWJsZSA6OiBvYmoKICAgIHRlc3RBbGxvYyA9IC50cnVlLgogIGVuZCBm dW5jdGlvbgoKICBsb2dpY2FsIGZ1bmN0aW9uIHRlc3RQdHIob2JqKQogICAg Y2xhc3ModCksIHBvaW50ZXIgOjogb2JqCiAgICB0ZXN0UHRyID0gLmZhbHNl LgogIGVuZCBmdW5jdGlvbgoKZW5kCg== --000000000000e81544056e5f1388--