From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2122) id 3E5583858295; Mon, 17 Oct 2022 21:16:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3E5583858295 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1666041413; bh=KyZDoWcrlZsyaaUCLSUpa+kTPGHV+Ys9RO8DWjg3leA=; h=From:To:Subject:Date:From; b=WgyGcnQq9XKy6VckETMl+WZB6EuGd5NDviTv8nvPvj35vFo4RDpg1gcLnXBBx28Rm YY2VQSmze5tB7m5vZsqOj7oQ8PCRb5qTUjBI/ZbAarZbiBZDhKpYqajDtm8wIjTmpy Vtzu69Q3TAX+95s6vifB55k/I6gkkiTIsSSNQkT0= 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++: disable constexpr assume contract special handling X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/heads/devel/c++-contracts X-Git-Oldrev: 0199003d90ca69d67eed1ae4bc919cef3addad69 X-Git-Newrev: 61b1ec945d6ec8a7580980507f732789b0f8ca87 Message-Id: <20221017211653.3E5583858295@sourceware.org> Date: Mon, 17 Oct 2022 21:16:53 +0000 (GMT) List-Id: https://gcc.gnu.org/g:61b1ec945d6ec8a7580980507f732789b0f8ca87 commit 61b1ec945d6ec8a7580980507f732789b0f8ca87 Author: Jason Merrill Date: Mon Oct 17 15:58:03 2022 -0400 c++: disable constexpr assume contract special handling This code was trying to avoid instantiating for an assumed contract, but the instantiation in contracts-assume6.C was happening earlier. Now it doesn't, but the testcase still expects it. So disable this code for now. gcc/cp/ChangeLog: * constexpr.cc (cxx_eval_constant_expression): Don't try to avoid instantiation for CCS_ASSUME. Diff: --- gcc/cp/constexpr.cc | 3 +++ 1 file changed, 3 insertions(+) diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc index 09267e538a8..57617847634 100644 --- a/gcc/cp/constexpr.cc +++ b/gcc/cp/constexpr.cc @@ -7740,11 +7740,14 @@ cxx_eval_constant_expression (const constexpr_ctx *ctx, tree t, tree c = CONTRACT_CONDITION (t); if (semantic == CCS_ASSUME) { +#if 0 /* For an assume contract, try evaluating it without instantiating anything. If non-constant, assume it's satisfied. */ + /* This breaks contracts-assume6.C. */ if (!cp_tree_defined_p (c)) break; +#endif bool dummy_nc = false, dummy_ov = false; constexpr_ctx new_ctx = *ctx;