From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 43DC33858C36; Thu, 3 Nov 2022 19:45:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 43DC33858C36 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1667504754; bh=T4DV2zUyCLj2/LwTpoYEFXXMO9NEARzNz3tClkzF4/M=; h=From:To:Subject:Date:From; b=Ye96Y3CM85xuvoWE4XUAi4m5biFJ68Il6UDWtawbh46E8UyYX3SAkrhUF/aGs6nj0 U24lHXLNiuZ0eMYMWZrch8C9jLMCEkNw3TaVRZgB00RxGcmYUBBwlxbCQU0nnCwbwB rop3RQKapfdYv3uDJPhNtj80Na3WOhNHvINhHaQA= Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jason Merrill To: gcc-cvs@gcc.gnu.org Subject: [gcc/devel/c++-contracts] c++: fix assume test X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/devel/c++-contracts X-Git-Oldrev: 43334477200de54ea246f714a55594c12b8a4d06 X-Git-Newrev: a05f106bafd5a74e677e3bddab6eeabbae362dc8 Message-Id: <20221103194554.43DC33858C36@sourceware.org> Date: Thu, 3 Nov 2022 19:45:53 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a05f106bafd5a74e677e3bddab6eeabbae362dc8 commit a05f106bafd5a74e677e3bddab6eeabbae362dc8 Author: Jason Merrill Date: Wed Nov 2 14:50:04 2022 -0400 c++: fix assume test Diff: --- gcc/testsuite/g++.dg/contracts/contracts-assume5.C | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/g++.dg/contracts/contracts-assume5.C b/gcc/testsuite/g++.dg/contracts/contracts-assume5.C index 67b28647786..372c0deb13a 100644 --- a/gcc/testsuite/g++.dg/contracts/contracts-assume5.C +++ b/gcc/testsuite/g++.dg/contracts/contracts-assume5.C @@ -1,7 +1,6 @@ -// test that assumed constexpr contracts that reference defined entities cause -// constexpr eval failure when the predicate is constexpr false -// test that assumed constexpr contracts that reference undefined entities in -// an unevaluated context cause constexpr eval failure +// test that assumed constexpr contracts that reference defined entities, or +// undefined entities in unevaluated context, cause constexpr eval failure when +// the predicate is constexpr false // { dg-do compile } // { dg-options "-std=c++2a -fcontracts" } @@ -20,16 +19,16 @@ constexpr int undef(int t); constexpr int dummy2() { - [[ assert assume: sizeof(decltype(f(1))) < 0 ]]; + [[ assert assume: sizeof(decltype(undef(1))) < 0 ]]; return -1; } int main() { constexpr int n = dummy(); // { dg-message "in .constexpr. expansion" } - // { dg-error "contract predicate" "" { target *-*-* } 15 } + // { dg-error "contract predicate" "" { target *-*-* } 14 } constexpr int m = dummy2(); // { dg-message "in .constexpr. expansion" } - // { dg-error "contract predicate" "" { target *-*-* } 23 } + // { dg-error "contract predicate" "" { target *-*-* } 22 } return 0; }