From nobody Thu Sep 05 06:20:28 2024 X-Original-To: dev-commits-ports-main@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 4Wzq3d0X9Vz5VHhb; Thu, 05 Sep 2024 06:20:29 +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 4Wzq3c1wvXz42V5; Thu, 5 Sep 2024 06:20:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1725517228; 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=edNqNs8nkDV4+96pzwtHzbE4fZivDOltGxtSm1nWHvU=; b=bYMWRmlt4oaSZPe9xBupx4E+/7j4eZLWOkeFR6Q5jyHgGJ14H5HLEDPTCYQA0ItmTNq9Fy 7JATSssQPNyALOS+ky+AEgzM/tazclfi0Q+v9MUnbL4lUAH7AoDKhWly2mcRUeOwkQhCy1 ROEhHerKFWiphlJBKokpdXgVMFqLnIQxCApv4kqg5vZNaOZaHQsZi+mCo0VgHVwXKSiNGO Li64+neB75WQLWl6KjySSWV7IqEokCl5J7vasoYRrd8itZoA7bJCn81GbjAsRnC1RTmoMg 8orcO2XSHEiBnrxke2b58RXs4D89g3WLg2MbL20AEdSMDvvzN05ugGu5kvZ8Yw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1725517228; a=rsa-sha256; cv=none; b=unvHMC7evNGv+SwyjLkRuAY4ju6bmh0kHsUllW0xoxsoFkbE7qtu3nQMH4G5x/vCc/Ckds 17K9YNWd55axby5azBQvFfwDoLYvO4o8ffZkVCNE6ZzWIOgMz733YW0hQKKwrrC2BYn5Px Aj9H/bHy8Kmxt+xzA7VZx1jFwGN5GHNXG8dmvVac+vtvHGvAGc/Zkm9pe37xHSHCJrZv37 9f79WMbrzCtBgx9aR9zJ0rzJJE/ZadUHK05tLlkEZHCiLdnK3i6srtTC88+vS63wYUoDoi o0ZE3zpq/p7GuqThyGv4S+y93t1xbZ5sbMfbc85XUtxPG1vyX0q21uuEQcTIQw== 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=1725517228; 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=edNqNs8nkDV4+96pzwtHzbE4fZivDOltGxtSm1nWHvU=; b=WBQLRalgF6lIbl2/NVeOVy63U3XUQ1h9pyd0AjEllAZK0sYwON2Vsl+9Or4ctXV/TUtAsw C/Ntcxz5ugz4CiQIErh7aL4pJ0Me4MDIf7qpVFCXYlItYhuXhQlUaho4CJ3dz/MRMUHlgM 9GsMFecJjuilbTfZyDb9cgjbsP1UCXrAgJQ2aRRzp7V1zi8MNWdTs6HH4VdbYOyIxqo+j7 Q6gySs0YxN6LjjdB6/PHFrBgQEzFWMjRhhl5WsYQCkoZAI1AbsxpHYY2DH/SLw23gHTrLI HdtGL/chFzr2MKOOZ63bkYzOsH4ZNEEBWGyFuaiGo2l2al9M8DmTYdeSj/gsPQ== 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 4Wzq3c1LwrzxFy; Thu, 5 Sep 2024 06:20:28 +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 4856KScq002383; Thu, 5 Sep 2024 06:20:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4856KSqX002380; Thu, 5 Sep 2024 06:20:28 GMT (envelope-from git) Date: Thu, 5 Sep 2024 06:20:28 GMT Message-Id: <202409050620.4856KSqX002380@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: b808c8521ddb - main - devel/pecl-vld: Fix build with php84 (8.4.0beta3+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b808c8521ddb527b95246e3744b7f2c1c6cece97 Auto-Submitted: auto-generated The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=b808c8521ddb527b95246e3744b7f2c1c6cece97 commit b808c8521ddb527b95246e3744b7f2c1c6cece97 Author: Po-Chuan Hsieh AuthorDate: 2024-09-05 05:25:51 +0000 Commit: Po-Chuan Hsieh CommitDate: 2024-09-05 06:17:53 +0000 devel/pecl-vld: Fix build with php84 (8.4.0beta3+) Obtained from: https://github.com/derickr/vld/commit/dc56f73a25b0230745afb5523871f2e8dd33fccd Reference: https://pkg-status.freebsd.org/beefy22/data/140amd64-default/b3cf46924d98/logs/php84-pecl-vld-0.18.0.log --- devel/pecl-vld/files/patch-php84 | 83 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 77 insertions(+), 6 deletions(-) diff --git a/devel/pecl-vld/files/patch-php84 b/devel/pecl-vld/files/patch-php84 index 522e53c134ea..13d955a790ba 100644 --- a/devel/pecl-vld/files/patch-php84 +++ b/devel/pecl-vld/files/patch-php84 @@ -1,4 +1,5 @@ Obtained from: https://github.com/derickr/vld/commit/df1c52c4cb62e5ff31e1b72e3f11df9a45ee567a + https://github.com/derickr/vld/commit/dc56f73a25b0230745afb5523871f2e8dd33fccd --- srm_oparray.c.orig 2022-09-16 08:00:47 UTC +++ srm_oparray.c @@ -44,21 +45,91 @@ Obtained from: https://github.com/derickr/vld/commit/df1c52c4cb62e5ff31e1b72e3f1 if (flags & EXT_VAL) { #if PHP_VERSION_ID >= 70300 if (op.opcode == ZEND_CATCH) { -@@ -1081,6 +1102,14 @@ int vld_find_jumps(zend_op_array *opa, unsigned int po - jumps[0] = VLD_JMP_EXIT; +@@ -1082,9 +1103,19 @@ int vld_find_jumps(zend_op_array *opa, unsigned int po *jump_count = 1; return 1; -+ + +#if PHP_VERSION_ID >= 80400 + } else if (opcode.opcode == ZEND_JMP_FRAMELESS) { -+ jumps[0] = VLD_ZNODE_JMP_LINE(opcode.op2, position, base_address); -+ jumps[1] = position + 1; ++ jumps[0] = position + 1; ++ jumps[1] = VLD_ZNODE_JMP_LINE(opcode.op2, position, base_address); + *jump_count = 2; + return 1; +#endif - ++ } else if ( opcode.opcode == ZEND_GENERATOR_RETURN || ++#if PHP_VERSION_ID < 80400 + opcode.opcode == ZEND_EXIT || ++#endif + opcode.opcode == ZEND_THROW || + #if PHP_VERSION_ID >= 80000 + opcode.opcode == ZEND_MATCH_ERROR || +@@ -1094,6 +1125,48 @@ int vld_find_jumps(zend_op_array *opa, unsigned int po + jumps[0] = VLD_JMP_EXIT; + *jump_count = 1; + return 1; ++ } else if ( ++ opcode.opcode == ZEND_INIT_FCALL ++ ) { ++ zval *func_name = RT_CONSTANT(&opa->opcodes[position], opcode.op2); ++ if (zend_string_equals_literal(Z_PTR_P(func_name), "exit")) { ++ int level = 0; ++ uint32_t start = position + 1; ++ ++ for (;;) { ++ switch (opa->opcodes[start].opcode) { ++ case ZEND_INIT_FCALL: ++ case ZEND_INIT_FCALL_BY_NAME: ++ case ZEND_INIT_NS_FCALL_BY_NAME: ++ case ZEND_INIT_DYNAMIC_CALL: ++ case ZEND_INIT_USER_CALL: ++ case ZEND_INIT_METHOD_CALL: ++ case ZEND_INIT_STATIC_METHOD_CALL: ++#if PHP_VERSION_ID >= 80400 ++ case ZEND_INIT_PARENT_PROPERTY_HOOK_CALL: ++#endif ++ case ZEND_NEW: ++ level++; ++ break; ++ case ZEND_DO_FCALL: ++ case ZEND_DO_FCALL_BY_NAME: ++ case ZEND_DO_ICALL: ++ case ZEND_DO_UCALL: ++ if (level == 0) { ++ goto done; ++ } ++ level--; ++ break; ++ } ++ start++; ++ } ++ done: ++ ZEND_ASSERT(opa->opcodes[start].opcode == ZEND_DO_ICALL); ++ jumps[0] = VLD_JMP_EXIT; ++ *jump_count = 1; ++ return 1; ++ } ++ + #if PHP_VERSION_ID >= 70200 + } else if ( + # if PHP_VERSION_ID >= 80000 +@@ -1233,6 +1306,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned i + break; + } + ++#if PHP_VERSION_ID < 80400 + /* See if we have an exit instruction */ + if (opa->opcodes[position].opcode == ZEND_EXIT) { + VLD_PRINT(1, "Exit found\n"); +@@ -1240,6 +1314,7 @@ void vld_analyse_branch(zend_op_array *opa, unsigned i + branch_info->branches[position].start_lineno = opa->opcodes[position].lineno; + break; + } ++#endif + /* See if we have a return instruction */ + if ( + opa->opcodes[position].opcode == ZEND_RETURN --- srm_oparray.h.orig 2022-09-16 08:00:47 UTC +++ srm_oparray.h @@ -57,6 +57,8 @@