From nobody Fri Mar 22 21:19:51 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 4V1ZwS0sSsz5FNYv; Fri, 22 Mar 2024 21:19:52 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4V1ZwS0MYvz4Gww; Fri, 22 Mar 2024 21:19:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1711142392; 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=IquTmWSKAMXtcVowXuAi5674H/HDAX/UBZKJ4nRalyM=; b=lSk4wpyfXGb9nc6mY15S7Wn5d6lHirExDnIBTZ6HfYyjSDD4ybM0SFZXWHZFYdTmWNSRFg Yi8PkTOfy3zNP13VeYRe6DC5UaE92ydWRC5MGDT26mOYnJ4tP5IUW07kZCQMfYrP4QnjVd MnlU7IwPNFzNc3eeEhw4R8JmeMbqP1d9k9x6TwW4hqjqPu2BMJECS+pU3VV5jnE+ryrn0G ncSyMSUfedSAROCX2MhHAS4zD+FEKRMq/qEkvRNh/XMWOFtpA4MIwYzg6TVpvpQxnKRN/g zEnSjyLh4Mfy5n84kqeXF0wzWvvJPo+KJQ41f8mp0x7o/LRNtqBgsMR6J2v4cA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1711142392; a=rsa-sha256; cv=none; b=k0FhZZfPdL86tqQ/GhHZnxeKU5soQOwX6s8SA9SKAH++olH7IAA+Ecw+l+iU/VvpKSeKdF VW4iuRuqZs/d/KLjH4Zy6l3RLKK6pSJRu8jlOcBdsP09Tsh74Xhl8ZHblSOMA0t7NWVWfq 8L/KyrN8q2A69peJ7sYLqnjqfpt6TNZaLR/LQEORsQADQUkqef/B7cTlGn0ySjoitmkVF+ dM6VOm94/neyEdAqJIU2dgjQCPacDFZSzSdapFzYtlUq3n7W4MYmSX4qNOA4P7EMhGHPxc A0ROZOE7UO0WdBe9pwrtEq0/mzGVdsAZYvF5FXp8fgK1OJNQrZxCaukgz8ZwRg== 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=1711142392; 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=IquTmWSKAMXtcVowXuAi5674H/HDAX/UBZKJ4nRalyM=; b=Ii0MoMRdTwlaQMqScy28uBx7pV3f2PzHl0+gWX88PSkQ4bUcM66lfMDHN658OQ4PaQn+nC 5XAS2JpIMoY6juP1Phc1DkChTSYyG1R44pJ+VeL92O7/aAAoFhNZ4b1eLrcgsVzCIn/TNp jTpobFHwIehR4Zu29C7ww5sWW/1NGw8RE5hde8npzgLQGqsBSuS2KcPs7k6lTCgwsivPI3 pSTLtXq7PegCCVAarXYPKW6u9wDHcFE+NxxY3YXLxRZc2Yuyy0mF1CinQVe0gs+yYRngOE c7tCX960ZM6APiuO8MxOyUJ1HGuAXfqYMcUFR58G3hga3geSIQ2jk/YoiLMrgQ== 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 4V1ZwR74DBzKgH; Fri, 22 Mar 2024 21:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 42MLJpvl086379; Fri, 22 Mar 2024 21:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 42MLJpHa086376; Fri, 22 Mar 2024 21:19:51 GMT (envelope-from git) Date: Fri, 22 Mar 2024 21:19:51 GMT Message-Id: <202403222119.42MLJpHa086376@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: 9e3ff8f0b99e - main - devel/qt5-script: Prevent clang from optimizing the code with undefined behavior 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: 9e3ff8f0b99e7b3074f3e83c954a0395185f63f0 Auto-Submitted: auto-generated The branch main has been updated by arrowd: URL: https://cgit.FreeBSD.org/ports/commit/?id=9e3ff8f0b99e7b3074f3e83c954a0395185f63f0 commit 9e3ff8f0b99e7b3074f3e83c954a0395185f63f0 Author: Tomas Tevesz AuthorDate: 2024-03-22 21:16:49 +0000 Commit: Gleb Popov CommitDate: 2024-03-22 21:18:36 +0000 devel/qt5-script: Prevent clang from optimizing the code with undefined behavior PR: 277236 Obtained from: OpenBSD ports --- devel/qt5-script/Makefile | 2 +- ..._javascriptcore_JavaScriptCore_interpreter_CallFrame.h | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/devel/qt5-script/Makefile b/devel/qt5-script/Makefile index cd8e2cddefbc..5fbf625428c9 100644 --- a/devel/qt5-script/Makefile +++ b/devel/qt5-script/Makefile @@ -1,6 +1,6 @@ PORTNAME= script PORTVERSION= ${QT5_VERSION}${QT5_KDE_PATCH} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel PKGNAMEPREFIX= qt5- diff --git a/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_CallFrame.h b/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_CallFrame.h new file mode 100644 index 000000000000..bce9105b6145 --- /dev/null +++ b/devel/qt5-script/files/patch-src_3rdparty_javascriptcore_JavaScriptCore_interpreter_CallFrame.h @@ -0,0 +1,15 @@ +Index: src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h +--- src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h.orig ++++ src/3rdparty/javascriptcore/JavaScriptCore/interpreter/CallFrame.h +@@ -135,9 +135,11 @@ namespace JSC { + static CallFrame* noCaller() { return reinterpret_cast(HostCallFrameFlag); } + int returnValueRegister() const { return this[RegisterFile::ReturnValueRegister].i(); } + ++#pragma clang optimize off + bool hasHostCallFrameFlag() const { return reinterpret_cast(this) & HostCallFrameFlag; } + CallFrame* addHostCallFrameFlag() const { return reinterpret_cast(reinterpret_cast(this) | HostCallFrameFlag); } + CallFrame* removeHostCallFrameFlag() { return reinterpret_cast(reinterpret_cast(this) & ~HostCallFrameFlag); } ++#pragma clang optimize on + + private: + void setArgumentCount(int count) { static_cast(this)[RegisterFile::ArgumentCount] = Register::withInt(count); }