From nobody Sun Sep 15 12:03:45 2024 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4X66C55RPnz5WK8Z; Sun, 15 Sep 2024 12:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4X66C53Ccjz42gQ; Sun, 15 Sep 2024 12:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726401825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XJBlGIiy3CRKDxEEH2iS8cir4R0sqr3GCbEZkEkLZk=; b=JWUuYSWnMN13MQRv0uF7tUJwNSmQkkkZxjJ3gMiUIQ5kO2NOVtbymbv7d2dgWL8vqusUC/ whRs8n2Hj0Fx7BeP7HS6M2Da7sdn6/qY+E713H2RQkFL6MbExS/5JBqenhNFYvanY5CABN JiCrxsjp/J7yZiQ7n2Xvf+2uWKXppQn3p/PKP9HDaS3ZP9seIJWmsePMPq9sJ+2h/fzW/O 8jM1SM4K9C0ogz7+hhQJoUGFIpKzWmRb4joduRteLWl8FXjytQllkk+cLCFWQHRenlIuAO fhD/0xZ526hMNrVwUWJGZDMusoe8cvIYroE5++3NlddQAGsNVxYERVtzXMFk2Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1726401825; a=rsa-sha256; cv=none; b=qRZPczwf158+4zIqR5QT3pf+p9cNDLtrN+RbUvSVR58ep2jNO2F48JT5RGfuaUV4viZ5fB hZppKHeZy99ydAHzYoPLGycEpBCsZ04I6mudhBUI+25f2u9nRKaty83uLhXFDxNSh+7Myq BUOraFF453Wx7ABC1ihoEbaxYNTYda5PgjNW0KTG9ltnZEg+fzWMzzRlk6XUazORutOVNq MhodQNkppnm8QTEbLdqZwgaYroeeh6EeTRZHp6zlVEWhl1ojpoqh8gd9SpgLj15Hmx/ita VCMwFvrPAEwNqIibZPrCVcTQO9Wq6SADTOG6mviegfAJBnp3mDEv/vXMpctF+g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1726401825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9XJBlGIiy3CRKDxEEH2iS8cir4R0sqr3GCbEZkEkLZk=; b=raOdyfVxKLJEZd+vPL2aBjJf1IFMVati7LsYkGhsItr8+7Odz/GUizsYE48AIXsZS+me2t jI6318HvSJzTmJ2gKVirz1X7lhhUrTGM9NA8FnzVacghqN16G0xm9Ma43jKrFC+y59/yWf 3lYKGwlBxqZ13TX2tX9J0Yw7c0TAym8vA6F2jXI4hTimbFPfzIYx55JrNnCyrishDwGQ1V FMwTc6uhHfZuAJ5a620Fr97Kdmcrd9RBGG9gCZMrwwpPRZjQ1c5lnCGxRtTGITqiv9SsOe 6hHRW0FNSuJHLWCtCDjMXlJqPx9QYj6tvAC2vhX1Ep53ToR7kiz7reLFB/TE2A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4X66C52lTHz18SG; Sun, 15 Sep 2024 12:03:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 48FC3jj1043689; Sun, 15 Sep 2024 12:03:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 48FC3jDY043686; Sun, 15 Sep 2024 12:03:45 GMT (envelope-from git) Date: Sun, 15 Sep 2024 12:03:45 GMT Message-Id: <202409151203.48FC3jDY043686@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Gleb Popov Subject: git: 88af7aa2d01a - main - math/z3: fix build with clang 19 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: arrowd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88af7aa2d01a15a3d77380bf590921e04996ef45 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=88af7aa2d01a15a3d77380bf590921e04996ef45 commit 88af7aa2d01a15a3d77380bf590921e04996ef45 Author: Dimitry Andric AuthorDate: 2024-09-15 11:53:50 +0000 Commit: Gleb Popov CommitDate: 2024-09-15 12:03:37 +0000 math/z3: fix build with clang 19 Clang 19 has become more strict about errors in member functions, which results in: /wrkdirs/usr/ports/math/z3/work/z3-z3-4.13.0/src/math/lp/static_matrix.h:82:72: error: no member named 'get' in 'static_matrix'; did you mean 'set'? 82 | ref operator=(ref & v) { m_matrix.set(m_row, m_col, v.m_matrix.get(v.m_row, v.m_col)); return *this; } | ^~~ | set /wrkdirs/usr/ports/math/z3/work/z3-z3-4.13.0/src/math/lp/static_matrix.h:164:10: note: 'set' declared here 164 | void set(unsigned row, unsigned col, T const & val); | ^ Upstream fixed this as part of a few other changes for gcc 15 in , but it does not apply cleanly to this version, so add a backported patch. PR: 281512 MFH: 2024Q3 --- math/z3/files/patch-backport-2ce89e5f4 | 125 +++++++++++++++++++++++++++++++++ 1 file changed, 125 insertions(+) diff --git a/math/z3/files/patch-backport-2ce89e5f4 b/math/z3/files/patch-backport-2ce89e5f4 new file mode 100644 index 000000000000..07161f1d64ed --- /dev/null +++ b/math/z3/files/patch-backport-2ce89e5f4 @@ -0,0 +1,125 @@ +From 2ce89e5f491fa817d02d8fdce8c62798beab258b Mon Sep 17 00:00:00 2001 +From: David Seifert <16636962+SoapGentoo@users.noreply.github.com> +Date: Mon, 29 Jul 2024 20:07:10 +0200 +Subject: [PATCH] Gcc 15 two phase (#7313) + +* Fix `-Wclass-memaccess` + +* Fix for GCC 15 two-phase lookup + +* GCC 15 is more aggressive about checking dependent names: + https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=r15-2117-g313afcfdabeab3 + +Bug: https://bugs.gentoo.org/936634 +--- + src/math/lp/lp_settings.h | 69 ++++++++++++++++----------------- + src/math/lp/static_matrix.h | 2 +- + src/math/lp/static_matrix_def.h | 2 +- + 3 files changed, 36 insertions(+), 37 deletions(-) + +diff --git src/math/lp/lp_settings.h src/math/lp/lp_settings.h +index d1a4be21c64..0d47877c76b 100644 +--- src/math/lp/lp_settings.h ++++ src/math/lp/lp_settings.h +--- src/math/lp/lp_settings.h.orig 2024-03-07 18:25:16 UTC ++++ src/math/lp/lp_settings.h +@@ -97,39 +97,39 @@ struct statistics { + }; + + struct statistics { +- unsigned m_make_feasible; +- unsigned m_total_iterations; +- unsigned m_iters_with_no_cost_growing; +- unsigned m_num_factorizations; +- unsigned m_num_of_implied_bounds; +- unsigned m_need_to_solve_inf; +- unsigned m_max_cols; +- unsigned m_max_rows; +- unsigned m_gcd_calls; +- unsigned m_gcd_conflicts; +- unsigned m_cube_calls; +- unsigned m_cube_success; +- unsigned m_patches; +- unsigned m_patches_success; +- unsigned m_hnf_cutter_calls; +- unsigned m_hnf_cuts; +- unsigned m_nla_calls; +- unsigned m_gomory_cuts; +- unsigned m_nla_add_bounds; +- unsigned m_nla_propagate_bounds; +- unsigned m_nla_propagate_eq; +- unsigned m_nla_lemmas; +- unsigned m_nra_calls; +- unsigned m_nla_bounds_improvements; +- unsigned m_horner_calls; +- unsigned m_horner_conflicts; +- unsigned m_cross_nested_forms; +- unsigned m_grobner_calls; +- unsigned m_grobner_conflicts; +- unsigned m_offset_eqs; +- unsigned m_fixed_eqs; ++ unsigned m_make_feasible = 0; ++ unsigned m_total_iterations = 0; ++ unsigned m_iters_with_no_cost_growing = 0; ++ unsigned m_num_factorizations = 0; ++ unsigned m_num_of_implied_bounds = 0; ++ unsigned m_need_to_solve_inf = 0; ++ unsigned m_max_cols = 0; ++ unsigned m_max_rows = 0; ++ unsigned m_gcd_calls = 0; ++ unsigned m_gcd_conflicts = 0; ++ unsigned m_cube_calls = 0; ++ unsigned m_cube_success = 0; ++ unsigned m_patches = 0; ++ unsigned m_patches_success = 0; ++ unsigned m_hnf_cutter_calls = 0; ++ unsigned m_hnf_cuts = 0; ++ unsigned m_nla_calls = 0; ++ unsigned m_gomory_cuts = 0; ++ unsigned m_nla_add_bounds = 0; ++ unsigned m_nla_propagate_bounds = 0; ++ unsigned m_nla_propagate_eq = 0; ++ unsigned m_nla_lemmas = 0; ++ unsigned m_nra_calls = 0; ++ unsigned m_nla_bounds_improvements = 0; ++ unsigned m_horner_calls = 0; ++ unsigned m_horner_conflicts = 0; ++ unsigned m_cross_nested_forms = 0; ++ unsigned m_grobner_calls = 0; ++ unsigned m_grobner_conflicts = 0; ++ unsigned m_offset_eqs = 0; ++ unsigned m_fixed_eqs = 0; + statistics() { reset(); } +- void reset() { memset(this, 0, sizeof(*this)); } ++ void reset() { *this = statistics{}; } + void collect_statistics(::statistics& st) const { + st.update("arith-factorizations", m_num_factorizations); + st.update("arith-make-feasible", m_make_feasible); +diff --git src/math/lp/static_matrix.h src/math/lp/static_matrix.h +index 9d6bb859964..42dd476b5d4 100644 +--- src/math/lp/static_matrix.h ++++ src/math/lp/static_matrix.h +@@ -79,7 +79,7 @@ class static_matrix (public) + ref(static_matrix & m, unsigned row, unsigned col):m_matrix(m), m_row(row), m_col(col) {} + ref & operator=(T const & v) { m_matrix.set( m_row, m_col, v); return *this; } + +- ref operator=(ref & v) { m_matrix.set(m_row, m_col, v.m_matrix.get(v.m_row, v.m_col)); return *this; } ++ ref operator=(ref & v) { m_matrix.set(m_row, m_col, v.m_matrix.get_elem(v.m_row, v.m_col)); return *this; } + + operator T () const { return m_matrix.get_elem(m_row, m_col); } + }; +diff --git src/math/lp/static_matrix_def.h src/math/lp/static_matrix_def.h +index 0370ee8990a..c3b2fc16821 100644 +--- src/math/lp/static_matrix_def.h ++++ src/math/lp/static_matrix_def.h +--- src/math/lp/static_matrix_def.h.orig 2024-03-07 18:25:16 UTC ++++ src/math/lp/static_matrix_def.h +@@ -92,7 +92,7 @@ static_matrix::static_matrix(static_matrix const + init_row_columns(m, m); + for (; m-- > 0; ) + for (auto & col : A.m_columns[m]) +- set(col.var(), m, A.get_value_of_column_cell(col)); ++ set(col.var(), m, A.get_column_cell(col)); + } + + template void static_matrix::clear() {