From patchwork Mon Mar 15 19:28:06 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nathan Sidwell X-Patchwork-Id: 1453526 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=sourceware.org; envelope-from=gcc-patches-bounces@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eYNwh9y9; dkim-atps=neutral Received: from sourceware.org (unknown [8.43.85.97]) (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 ozlabs.org (Postfix) with ESMTPS id 4Dzmfk4xrzz9sVb for ; Tue, 16 Mar 2021 06:28:13 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 83A9B3857820; Mon, 15 Mar 2021 19:28:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-qt1-x82c.google.com (mail-qt1-x82c.google.com [IPv6:2607:f8b0:4864:20::82c]) by sourceware.org (Postfix) with ESMTPS id 7A9683858C27 for ; Mon, 15 Mar 2021 19:28:08 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7A9683858C27 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=acm.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=nathanmsidwell@gmail.com Received: by mail-qt1-x82c.google.com with SMTP id g24so9980917qts.6 for ; Mon, 15 Mar 2021 12:28:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:to:from:subject:message-id:date:user-agent:mime-version :content-language; bh=QV/QCyYygPDYDzGtlU86oop0XEC744UwXE3zZrVEJxQ=; b=eYNwh9y9gACpH2kCI08Y2B53Ca9Whrf+foZrE8jm/egQsPfb+Vl7vbXtChrrBhTmY+ JYu6f9NEJqVGfFpDWvXVd3pZoRGi4jXTAnFHOFIIYTO3Y+GirQ5hGiMnVwioxtQcFIkl LK2/JTIe3eQnj/OfOkdmg9XgN0JKXcVP29cnc1b01Sfjb7JuUC6FDS50XIWLYnX2HtAB LWqbF0RuyBnpjAK6ix0u2mLcsq1HC0VyhQMNCtIBExaWNBviMedC3vTMfu3Up7q5bqBj m4v5/8DfBFWemGAG9JGwNtfAAONdifFSbgQKDhOnAPS7fiPQTuMwxCRhzR3phuMN4W1j 0acg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:to:from:subject:message-id:date :user-agent:mime-version:content-language; bh=QV/QCyYygPDYDzGtlU86oop0XEC744UwXE3zZrVEJxQ=; b=Cn5aWhWW5ZTxY9yzpPn5NYPefTOlX+EVTPLkUhNFtB5ZXlBQOZpvOZ60QJ5JXSm4Nb 7IVVZCIRRkI1Fhel3OvWC0tnKnb5bTKmBGzPn3jg11rca048AjwBeeYc4GgyFSfEy2Yx pNBvI3FUqqDSFMfmw919AI2W/9dAkfP6thX0cRr0aADTJgrr+SQDN+4jkJjsH+T59xoh +JzvvvwSDFEd5K4Az7vHhAQLifA/ujAVZ0vltP0oLxzzadugIHCvFIgd7AS0Z2ZJDnzQ 6YOa6RDc/SQ+5R8Syp6LbUAZL4dENre9NPSBYmX5g2zAAr4gNjy/pba6Do+xrC2l9gTf 9W1g== X-Gm-Message-State: AOAM531a5IUXCIVKeRc/YyEOfY0Nb5zqw6JazXXhmftJbPVxi/slH08c razOe7RdIARWCTyOOaiTbUE= X-Google-Smtp-Source: ABdhPJw3o1+Hi1YM8nOB80/qKpIRApUrxtENS2AZ6vChppWJ1Dmy6NfJjWgCzhcCbhuPJLh91mMm9g== X-Received: by 2002:ac8:750a:: with SMTP id u10mr23879383qtq.351.1615836487989; Mon, 15 Mar 2021 12:28:07 -0700 (PDT) Received: from ?IPv6:2601:181:c400:1050:a491:b44f:a8e8:3bcc? ([2601:181:c400:1050:a491:b44f:a8e8:3bcc]) by smtp.googlemail.com with ESMTPSA id f17sm11612449qtl.89.2021.03.15.12.28.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 15 Mar 2021 12:28:07 -0700 (PDT) To: GCC Patches From: Nathan Sidwell Subject: c++: Fix 2 testcases [PR 99601] Message-ID: <74ff41d9-9d96-11c6-7580-f35b0c0627fa@acm.org> Date: Mon, 15 Mar 2021 15:28:06 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.5.0 MIME-Version: 1.0 Content-Language: en-US X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM, GIT_PATCH_0, HEADER_FROM_DIFFERENT_DOMAINS, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" I'd failed to correctly restrict some checks to lp64 x86 targets. PR c++/99601 gcc/testsuite/ * g++.dg/modules/builtin-3_a.C: Fix lp64 x86 detection. * g++.dg/modules/builtin-3_b.C: Fix lp64 x86 detection. diff --git c/gcc/testsuite/g++.dg/modules/builtin-3_a.C w/gcc/testsuite/g++.dg/modules/builtin-3_a.C index ad30ccf2a01..5f61fa4efab 100644 --- c/gcc/testsuite/g++.dg/modules/builtin-3_a.C +++ w/gcc/testsuite/g++.dg/modules/builtin-3_a.C @@ -30,8 +30,8 @@ export inline int count (int a, ...) // The implementation details of va_list's are target-specific. // Usually one of two patterns though // { dg-final { scan-lang-dump-not { Cluster members:\n \[0\]=decl declaration '::__builtin_va_list'\n \[1\]=binding '::__builtin_va_list'\n} module { target i?86-*-linux* x86_64-*-linux* } } } -// { dg-final { scan-lang-dump {Wrote GMF:-[0-9]* type_decl:'::__builtin_va_list'@builtins} module { target x86_64-*-linux* } } } -// { dg-final { scan-lang-dump {Writing:-[0-9]*'s named merge key \(decl\) type_decl:'::__builtin_va_list'} module { target x86_64-*-linux* } } } +// { dg-final { scan-lang-dump {Wrote GMF:-[0-9]* type_decl:'::__builtin_va_list'@builtins} module { { target x86_64-*-linux* i>86-*-linux* } && lp64 } } +// { dg-final { scan-lang-dump {Writing:-[0-9]*'s named merge key \(decl\) type_decl:'::__builtin_va_list'} module { target { x86_64-*-linux* i?86-*-linux* } && lp64 } } } // { dg-final { scan-lang-dump {Writing:-1's named merge key \(decl\) type_decl:'::__gnuc_va_list'} module { target i?86-*-linux* *-*-darwin* } } } // { dg-final { scan-lang-dump {Wrote GMF:-3 type_decl:'::__gnuc_va_list'@builtins} module { target i?86-*-linux* *-*-darwin* } } } diff --git c/gcc/testsuite/g++.dg/modules/builtin-3_b.C w/gcc/testsuite/g++.dg/modules/builtin-3_b.C index 93489bddba4..5c94890c9c4 100644 --- c/gcc/testsuite/g++.dg/modules/builtin-3_b.C +++ w/gcc/testsuite/g++.dg/modules/builtin-3_b.C @@ -8,6 +8,6 @@ int main () } // { dg-final { scan-lang-dump {Read:-[0-9]*'s named merge key \(matched\) function_decl:'::__builtin_strlen'} module } } -// { dg-final { scan-lang-dump {Read:-[0-9]*'s named merge key \(matched\) type_decl:'::__builtin_va_list'} module { target { x86_64-*-linux* } } } } +// { dg-final { scan-lang-dump {Read:-[0-9]*'s named merge key \(matched\) type_decl:'::__builtin_va_list'} module { target { { x86_64-*-linux* i?86-*-linux* } && lp64 } } } // { dg-final { scan-lang-dump {Read:-[0-9]*'s named merge key \(new\) type_decl:'::va_list'} module } } // { dg-final { scan-lang-dump {Read:-[0-9]*'s named merge key \(new\) type_decl:'::__gnuc_va_list'} module } }