From nobody Thu Jul 20 19:55:48 2023 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 4R6Nj12TYdz4ntp4; Thu, 20 Jul 2023 19:55:49 +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 4R6Nj10t2gz4Px4; Thu, 20 Jul 2023 19:55:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689882949; 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=0Bk8OUGPkQwIWEnl3PNf+phr27JmeqXsLykkWRsNz/s=; b=RlA8kmi8iaYHZeJdIdU5UWLz2ah83whpIJgOcva7x+Gd9vn1OX+bsWrkvwIUJmONdOoiXv Q0b+lUMz4G5V8BouP7Lty/IfIPf7hTAsah1cPkmIIfKHYmx4k6b1vxw8iVLwDqzWQQVeO8 cbhD07FoKqH4c/KaY6LqjEBcOZVjwtapHpZHQGYuJgkdtAbQiQdLOq3yejOl3g0LnH1o3R yD5btfQR1PqBKzIwif0Q1v9H5GgFv6RtitJvAd89plxQhUca/zOJuE3i5Y7wI073gqva/Q frHQbhKPd37zZzuICg0R+FPCXz7uzJUxz/G4o2z4y8LeoBROAC2ug76J9BNEpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689882949; 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=0Bk8OUGPkQwIWEnl3PNf+phr27JmeqXsLykkWRsNz/s=; b=Psf36vD33X3x4EjpI9aGTuRRF+gucOIqD9aYfjidV9qrqqXJ/KKi6Vr2lae2QAVR3AMCNH FGKKkoJpUF7za2ehkj/mq9wXElNhJiwLW383jhZO8plHW/vZyMq54CXbcXTWqW9tq6eekC /NC8FQHjnQOOGI4Cn332hTLWJxvZ7ZDQzGO6aHA158qdExHbTZbAJX5M3dqLX3bmW2aEMy BQWOo6hs0e4Qo1jRxhbEkl7LTubXFCIsoEVxNH1iz5zBWW/aNFvRsmd8TdVFveVbtO/MLf ikoUJzaCf9ECFmIJihjeOwGLR54x4dZuW96FRTwjOFdVlbTEuGQEOUh44eEXpg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689882949; a=rsa-sha256; cv=none; b=NKi3InPg+bXcqaHH700bKL0cuTXYZ5tNO7CeL3TRW7KDEZF6HaraSA6sv5SCIPFjEFBVCh OrUQyshWraLdvyUpdl5ghc284gx9mdsiRGEq3Ex3ugbsc+cYpXPZa3bnza2PaxYn1oM8AN rDCRrn84cIAr3kqXmAMhc/d+nHZ3yrG2FVPd2BNS4p/9i2VVZcUtUwj+IEBQCBAHr75kQ5 Z4JNPCybs36+eWSLvSuu8pQX9bliYOqjMiThUmrQQJw/Eo+TVsT+Qc+h7ZL47U5ucPhA6J IufOWhOehqINxkuDT7WqUEVhUHq2rK+gRXB6Rxa5baR1LhuL0Cm+RqaFaLQhJw== 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 4R6Nj06zrpzk6x; Thu, 20 Jul 2023 19:55:48 +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 36KJtmoI053068; Thu, 20 Jul 2023 19:55:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36KJtmtJ053067; Thu, 20 Jul 2023 19:55:48 GMT (envelope-from git) Date: Thu, 20 Jul 2023 19:55:48 GMT Message-Id: <202307201955.36KJtmtJ053067@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Brooks Davis Subject: git: 15c6bbdcf036 - 2023Q3 - devel/llvm16: backport upstream powerpc FP fix 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: 15c6bbdcf036f237ad6856f6e320788f92eb8892 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=15c6bbdcf036f237ad6856f6e320788f92eb8892 commit 15c6bbdcf036f237ad6856f6e320788f92eb8892 Author: Brooks Davis AuthorDate: 2023-07-14 19:07:06 +0000 Commit: Brooks Davis CommitDate: 2023-07-20 18:34:51 +0000 devel/llvm16: backport upstream powerpc FP fix The upstream commit fde5924dcc69 has been merged to llvm in the FreeBSD main branch so merge it here as well. Issue: https://github.com/llvm/llvm-project/issues/63542 (cherry picked from commit 2a9d785d67c6d66268d46f4d3ff0f255dc01e9ea) --- devel/llvm16/Makefile | 2 +- devel/llvm16/files/patch-backport-fde5924dcc69 | 45 ++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/devel/llvm16/Makefile b/devel/llvm16/Makefile index 7a70876d13e7..c261324da428 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 16.0.6 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= devel lang MASTER_SITES= https://github.com/llvm/llvm-project/releases/download/llvmorg-${DISTVERSION:S/rc/-rc/}/ \ https://${PRE_}releases.llvm.org/${LLVM_RELEASE}${RCDIR}/ diff --git a/devel/llvm16/files/patch-backport-fde5924dcc69 b/devel/llvm16/files/patch-backport-fde5924dcc69 new file mode 100644 index 000000000000..a4fad341afdc --- /dev/null +++ b/devel/llvm16/files/patch-backport-fde5924dcc69 @@ -0,0 +1,45 @@ +commit fde5924dcc69fe814085482df259b8cfee236f2c +Author: Serge Pavlov +Date: Thu Jul 13 11:49:00 2023 +0700 + + [clang] Reset FP options before template instantiation + + AST nodes that may depend on FP options keep them as a difference + relative to the options outside the AST node. At the moment of + instantiation the FP options may be different from the default values, + defined by command-line option. In such case FP attributes would have + unexpected values. For example, the code: + + template void func_01(int last, C) { + func_01(last, int()); + } + void func_02() { func_01(0, 1); } + #pragma STDC FENV_ACCESS ON + + caused compiler crash, because template instantiation takes place at the + end of translation unit, where pragma STDC FENV_ACCESS is in effect. As + a result, code in the template instantiation would use constrained + intrinsics while the function does not have StrictFP attribute. + + To solve this problem, FP attributes in Sema must be set to default + values, defined by command line options. + + This change resolves https://github.com/llvm/llvm-project/issues/63542. + + Differential Revision: https://reviews.llvm.org/D154359 + +diff --git clang/lib/Sema/SemaTemplateInstantiateDecl.cpp clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +index 492fe8ba1b14..9e5f85b0f916 100644 +--- clang/lib/Sema/SemaTemplateInstantiateDecl.cpp ++++ clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +@@ -5087,6 +5087,10 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation, + // PushDeclContext because we don't have a scope. + Sema::ContextRAII savedContext(*this, Function); + ++ FPFeaturesStateRAII SavedFPFeatures(*this); ++ CurFPFeatures = FPOptions(getLangOpts()); ++ FpPragmaStack.CurrentValue = FPOptionsOverride(); ++ + if (addInstantiatedParametersToScope(Function, PatternDecl, Scope, + TemplateArgs)) + return;