C++98/03 [temp.friend]p4 requires that inline function definitions
within class templates be instantiated along with each class template
specialization, even if the functions are not used. Do so, as a baby
step toward PR6952.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@103943 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaTemplateInstantiateDecl.cpp b/lib/Sema/SemaTemplateInstantiateDecl.cpp
index adba32e..41c6218 100644
--- a/lib/Sema/SemaTemplateInstantiateDecl.cpp
+++ b/lib/Sema/SemaTemplateInstantiateDecl.cpp
@@ -1009,6 +1009,7 @@
Params[P]->setOwningFunction(Function);
Function->setParams(Params.data(), Params.size());
+ SourceLocation InstantiateAtPOI;
if (TemplateParams) {
// Our resulting instantiation is actually a function template, since we
// are substituting only the outer template parameters. For example, given
@@ -1047,6 +1048,23 @@
// TODO: should we remember this connection regardless of whether
// the friend declaration provided a body?
Function->setInstantiationOfMemberFunction(D, TSK_ImplicitInstantiation);
+ if (!SemaRef.getLangOptions().CPlusPlus0x) {
+ // C++03 [temp.friend]p4:
+ // When a function is defined in a friend function declaration in a
+ // class template, the function is defined at each instantiation of the
+ // class template. The function is defined even if it is never used.
+ if (CXXRecordDecl *Record = dyn_cast<CXXRecordDecl>(Owner)) {
+ if (ClassTemplateSpecializationDecl *Spec
+ = dyn_cast<ClassTemplateSpecializationDecl>(Record))
+ InstantiateAtPOI = Spec->getPointOfInstantiation();
+ else if (MemberSpecializationInfo *MSInfo
+ = Record->getMemberSpecializationInfo())
+ InstantiateAtPOI = MSInfo->getPointOfInstantiation();
+ }
+
+ if (InstantiateAtPOI.isInvalid())
+ InstantiateAtPOI = Function->getLocation();
+ }
}
if (InitFunctionInstantiation(Function, D))
@@ -1133,6 +1151,11 @@
PrincipalDecl->isInIdentifierNamespace(Decl::IDNS_Ordinary))
PrincipalDecl->setNonMemberOperator();
+ // If we need to instantiate this function now (because it is a C++98/03
+ // friend function defined inside a class template), do so.
+ if (InstantiateAtPOI.isValid())
+ SemaRef.MarkDeclarationReferenced(InstantiateAtPOI, Function);
+
return Function;
}
diff --git a/test/CXX/class.access/class.friend/p1.cpp b/test/CXX/class.access/class.friend/p1.cpp
index 991698d..e9177d4 100644
--- a/test/CXX/class.access/class.friend/p1.cpp
+++ b/test/CXX/class.access/class.friend/p1.cpp
@@ -188,8 +188,8 @@
struct Inequal {};
bool test() {
- Holder<Inequal> a, b;
- return a == b; // expected-note {{requested here}}
+ Holder<Inequal> a, b; // expected-note {{requested here}}
+ return a == b;
}
}
diff --git a/test/CXX/temp/temp.decls/temp.friend/p4.cpp b/test/CXX/temp/temp.decls/temp.friend/p4.cpp
new file mode 100644
index 0000000..6490aeb
--- /dev/null
+++ b/test/CXX/temp/temp.decls/temp.friend/p4.cpp
@@ -0,0 +1,9 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+
+template<typename T>
+struct X {
+ friend void f(int x) { T* y = x; } // expected-error{{cannot initialize a variable of type 'int *' with an lvalue of type 'int'}}
+};
+
+X<int> xi; // expected-note{{in instantiation of member function 'f' requested here}}
+