diff --git a/clang/docs/ReleaseNotes.rst b/clang/docs/ReleaseNotes.rst --- a/clang/docs/ReleaseNotes.rst +++ b/clang/docs/ReleaseNotes.rst @@ -181,6 +181,8 @@ emitted as a dynamic initializer. Previously the variable would incorrectly be zero-initialized. In contexts where a dynamic initializer is not allowed this is now diagnosed as an error. +- Clang now correctly emits symbols for implicitly instantiated constexpr + template function. Fixes `Issue 55560 `_. Improvements to Clang's diagnostics ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp --- a/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp +++ b/clang/lib/Sema/SemaTemplateInstantiateDecl.cpp @@ -4840,7 +4840,8 @@ /*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); @@ -4855,7 +4856,7 @@ 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 --- /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 +constexpr T foo(T a); + +// CHECK-LABEL: define {{.*}} @main +int main() { + // CHECK: call {{.*}} @_Z3fooIiET_S0_ + int k = foo(5); +} +// CHECK: } + +template +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 --- /dev/null +++ b/clang/test/SemaCXX/constexpr-late-instantiation.cpp @@ -0,0 +1,15 @@ +// RUN: %clang_cc1 %s -fsyntax-only -verify + +template +constexpr T foo(T a); // expected-note {{declared here}} + +int main() { + int k = foo(5); // Ok + constexpr int j = // expected-error {{constexpr variable 'j' must be initialized by a constant expression}} + foo(5); // expected-note {{undefined function 'foo' cannot be used in a constant expression}} +} + +template +constexpr T foo(T a) { + return a; +}