From nobody Fri Jul 14 19:07:18 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 4R2gvp4Hj1z4n1Jf; Fri, 14 Jul 2023 19:07:18 +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 4R2gvp3vB1z4Qs7; Fri, 14 Jul 2023 19:07:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689361638; 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=z3idEbTUs9SGH6l7KyI7v7pl2bLKtkl3s3z4GBOidmU=; b=UyWhKsr91TAe5yd3mUSe3xxEQNo/8M621AwyRtns0UyPGc6s0BpYCUF5vpyXJvJlZieNtm ZjHfNs5EMmiscBGGpXRLvEEUx9JRdNMgxOZL0cNcaEgAezRAty/VbKpdPiuM+rUAy64PO0 v/WOeHJ3KijwGh/qMGGUhzqU/1JBgsoNAg12jpQ7qbBfw3ekLubYj+0+F7YN4EHpVEVYB5 dCsoAZFq5c+z0k7gen7kRuEvnhGX8ASynslECtbP7uOB+QeL7vk6FkRkJSnR+WOcQfcEGv U97ixW8gKwZBpbFwPighzW+kw7O6uhPewwfRwSGLeDW+WfEs50iu118sMV/5eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689361638; 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=z3idEbTUs9SGH6l7KyI7v7pl2bLKtkl3s3z4GBOidmU=; b=BiZPRFQ0jG+8BkhehRARiFp9stS6qOqjYjcWCUn/4OmErGAxG2XLQzm9ZQoarIIikkXVFY gxa18xJRF1fApFi9rXKfjpIZGozgiAJmbGqdPU0B6DyCbeB6Dpa7gPg8p+iOWqzGg8mdyR uZRosjEeW8JUNZdJ3MNjLjs71Qs+V59kdsVQNCU1TUgMVZI24mO9PO2X7lMpkIYEumuRiX 781HOV/jVweRvIQa8RocB5kriBP/M5Jd0SPNkggA1vaviHf7nPRGLn3EdnEpybFgvKjHZB w00tJ2gJl8leTD3NgauzkEE9GNB/cgkWX+4n6SBtP2fMU3Iep+GVkv7zMxuaCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689361638; a=rsa-sha256; cv=none; b=oifmUsAww4XfjZTqv1m8ri49EaIu8DSIyvBRtXHOKEUoogk9BqIymamOYLA+yXRx9zT8uf 9tzeE6DM5YR+VjAh+zg2b5zYalAPgu5HMVf+fXDUGX7ym3PX7qpyWQOZDWVcdyVYaRay0I YzbbDPz/UGDkDGgjNOIh8KuhahA1fYZMnnAjHfffwhYGe/WlKuho9IwTbiu2a/Hp1mx7ph /PdOpfRj284hJ3ifmgET4pOnP+e1SJDSQfZVLR2020Ailm07RihSV6JLc1MX88gSLTFqOS fhQHa/3pBumJXgybadUBZ35aPA6Fi9K+CrNoJVl+sHR+cIVt7r7/+mkBAahzdQ== 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 4R2gvp2zyjzTD2; Fri, 14 Jul 2023 19:07:18 +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 36EJ7Itr061020; Fri, 14 Jul 2023 19:07:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36EJ7I88061019; Fri, 14 Jul 2023 19:07:18 GMT (envelope-from git) Date: Fri, 14 Jul 2023 19:07:18 GMT Message-Id: <202307141907.36EJ7I88061019@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Brooks Davis Subject: git: 2a9d785d67c6 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 2a9d785d67c6d66268d46f4d3ff0f255dc01e9ea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/ports/commit/?id=2a9d785d67c6d66268d46f4d3ff0f255dc01e9ea commit 2a9d785d67c6d66268d46f4d3ff0f255dc01e9ea Author: Brooks Davis AuthorDate: 2023-07-14 19:07:06 +0000 Commit: Brooks Davis CommitDate: 2023-07-14 19:07:06 +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 --- 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 196dd616cc30..7eaa3bc0f313 100644 --- a/devel/llvm16/Makefile +++ b/devel/llvm16/Makefile @@ -1,6 +1,6 @@ PORTNAME= llvm DISTVERSION= 16.0.6 -PORTREVISION= 3 +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;