rpms
/
clang
20
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

import clang-14.0.6-4.el9_1

Browse Source
i9c changed/i9c/clang-14.0.6-4.el9_1
MSVSphere Packaging Team 2 years ago
parent bed38f9e1e
commit 1ea4171515
2 changed files with 103 additions and 1 deletions
Show Stats Download Patch File Download Diff File

90
SOURCES/0001-clang-Enforce-instantiation-of-constexpr-template-fu.patch
Unescape View File

@ -0,0 +1,90 @@
From c081bf4098c729afacf20303cc9df62bf13c3362 Mon Sep 17 00:00:00 2001
From: serge-sans-paille <sguelton@redhat.com>
Date: Sat, 18 Jun 2022 13:48:41 +0200
Subject: [PATCH] [clang] Enforce instantiation of constexpr template functions
during non-constexpr evaluation
Otherwise these functions are not instantiated and we end up with an undefined
symbol.
Fix #55560
Differential Revision: https://reviews.llvm.org/D128119
---
clang/lib/Sema/SemaTemplateInstantiateDecl.cpp | 5 +++--
.../CodeGenCXX/constexpr-late-instantiation.cpp | 17 +++++++++++++++++
.../SemaCXX/constexpr-late-instantiation.cpp | 15 +++++++++++++++
3 files changed, 35 insertions(+), 2 deletions(-)
create mode 100644 clang/test/CodeGenCXX/constexpr-late-instantiation.cpp
create mode 100644 clang/test/SemaCXX/constexpr-late-instantiation.cpp
diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
index 467372c71496..293782822e83 100644
--- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -4826,7 +4826,8 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation,
/*Complain*/DefinitionRequired)) {
if (DefinitionRequired)
Function->setInvalidDecl();
- else if (TSK == TSK_ExplicitInstantiationDefinition) {
+ else if (TSK == TSK_ExplicitInstantiationDefinition ||
+ (Function->isConstexpr() && !Recursive)) {
// Try again at the end of the translation unit (at which point a
// definition will be required).
assert(!Recursive);
@@ -4841,7 +4842,7 @@ void Sema::InstantiateFunctionDefinition(SourceLocation PointOfInstantiation,
Diag(PatternDecl->getLocation(), diag::note_forward_template_decl);
if (getLangOpts().CPlusPlus11)
Diag(PointOfInstantiation, diag::note_inst_declaration_hint)
- << Function;
+ << Function;
}
}
diff --git a/clang/test/CodeGenCXX/constexpr-late-instantiation.cpp b/clang/test/CodeGenCXX/constexpr-late-instantiation.cpp
new file mode 100644
index 000000000000..1c8eef73f2dd
--- /dev/null
+++ b/clang/test/CodeGenCXX/constexpr-late-instantiation.cpp
@@ -0,0 +1,17 @@
+// Make sure foo is instantiated and we don't get a link error
+// RUN: %clang_cc1 -S -emit-llvm -triple %itanium_abi_triple %s -o- | FileCheck %s
+
+template <typename T>
+constexpr T foo(T a);
+
+// CHECK-LABEL: define {{.*}} @main
+int main() {
+ // CHECK: call {{.*}} @_Z3fooIiET_S0_
+ int k = foo<int>(5);
+}
+// CHECK: }
+
+template <typename T>
+constexpr T foo(T a) {
+ return a;
+}
diff --git a/clang/test/SemaCXX/constexpr-late-instantiation.cpp b/clang/test/SemaCXX/constexpr-late-instantiation.cpp
new file mode 100644
index 000000000000..ec8e071217c1
--- /dev/null
+++ b/clang/test/SemaCXX/constexpr-late-instantiation.cpp
@@ -0,0 +1,15 @@
+// RUN: %clang_cc1 %s -fsyntax-only -verify
+
+template <typename T>
+constexpr T foo(T a); // expected-note {{declared here}}
+
+int main() {
+ int k = foo<int>(5); // Ok
+ constexpr int j = // expected-error {{constexpr variable 'j' must be initialized by a constant expression}}
+ foo<int>(5); // expected-note {{undefined function 'foo<int>' cannot be used in a constant expression}}
+}
+
+template <typename T>
+constexpr T foo(T a) {
+ return a;
+}
--
2.38.1

14
SPECS/clang.spec
Unescape View File

@ -45,7 +45,7 @@
Name: %pkg_name Name: %pkg_name
Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}} Version: %{clang_version}%{?rc_ver:~rc%{rc_ver}}
Release: 1%{?dist} Release: 4%{?dist}
Summary: A C language family front-end for LLVM Summary: A C language family front-end for LLVM
License: NCSA License: NCSA
@ -75,6 +75,7 @@ Patch4: 0001-cmake-Allow-shared-libraries-to-customize-the-soname.patch
Patch5: 0001-Work-around-gcc-miscompile.patch Patch5: 0001-Work-around-gcc-miscompile.patch
Patch7: 0010-PATCH-clang-Produce-DWARF4-by-default.patch Patch7: 0010-PATCH-clang-Produce-DWARF4-by-default.patch
Patch8: disable-recommonmark.patch Patch8: disable-recommonmark.patch
Patch9: 0001-clang-Enforce-instantiation-of-constexpr-template-fu.patch
# Patches for clang-tools-extra # Patches for clang-tools-extra
# See https://reviews.llvm.org/D120301 # See https://reviews.llvm.org/D120301
@ -374,6 +375,7 @@ mv ../clang-%{compat_ver}.src ../clang
-DCLANG_INCLUDE_TESTS:BOOL=ON \ -DCLANG_INCLUDE_TESTS:BOOL=ON \
-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \ -DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR=../%{clang_tools_srcdir} \
-DLLVM_EXTERNAL_LIT=%{_bindir}/lit \ -DLLVM_EXTERNAL_LIT=%{_bindir}/lit \
-DLLVM_LIT_ARGS="-vv" \
-DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \ -DLLVM_MAIN_SRC_DIR=%{_datadir}/llvm/src \
%if 0%{?__isa_bits} == 64 %if 0%{?__isa_bits} == 64
-DLLVM_LIBDIR_SUFFIX=64 \ -DLLVM_LIBDIR_SUFFIX=64 \
@ -652,6 +654,16 @@ false
* Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 14.0.6-1 * Wed Mar 15 2023 MSVSphere Packaging Team <packager@msvsphere.ru> - 14.0.6-1
- Rebuilt for MSVSphere 9.1. - Rebuilt for MSVSphere 9.1.
* Tue Dec 13 2022 Konrad Kleine <kkleine@redat.com> - 14.0.6-4
- Bump release version
* Fri Dec 09 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-3
- Print executed tests
* Tue Dec 06 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-2
- Fix upstream bug llvm#55560
- https://bugzilla.redhat.com/show_bug.cgi?id=2150854
* Tue Jul 19 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-1 * Tue Jul 19 2022 Timm Bäder <tbaeder@redhat.com> - 14.0.6-1
- Update to 14.0.6 - Update to 14.0.6

Write Preview
Loading…
Cancel
Save