diff options
author | Douglas Gregor <dgregor@apple.com> | 2009-09-11 20:15:17 +0000 |
---|---|---|
committer | Douglas Gregor <dgregor@apple.com> | 2009-09-11 20:15:17 +0000 |
commit | 9f185076dc8b79c8240b20a8746da96beb3f147b (patch) | |
tree | d18d41a3efaa8c75fcae701b6c252b3294899012 | |
parent | d5d6778fb91d018cbd57456cae71289640ea8e66 (diff) |
Tweak the semantics of FunctionDecl::isOutOfLine to consider an
instantiation of a member function template or member function of a
class template to be out-of-line if the definition of that function
template or member function was defined out-of-line. This ensures that
we get the correct linkage for explicit instantiations of out-of-line
definitions.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@81562 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r-- | include/clang/AST/Decl.h | 4 | ||||
-rw-r--r-- | include/clang/AST/DeclCXX.h | 2 | ||||
-rw-r--r-- | lib/AST/Decl.cpp | 24 | ||||
-rw-r--r-- | lib/AST/DeclCXX.cpp | 1 | ||||
-rw-r--r-- | test/CodeGenCXX/explicit-instantiation.cpp | 7 |
5 files changed, 31 insertions, 7 deletions
diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h index ee3ddb09aa..01276bae1d 100644 --- a/include/clang/AST/Decl.h +++ b/include/clang/AST/Decl.h @@ -1137,6 +1137,10 @@ public: /// represents. void setTemplateSpecializationKind(TemplateSpecializationKind TSK); + /// \brief Determine whether this is or was instantiated from an out-of-line + /// definition of a member function. + bool isOutOfLine() const; + // Implement isa/cast/dyncast/etc. static bool classof(const Decl *D) { return D->getKind() >= FunctionFirst && D->getKind() <= FunctionLast; diff --git a/include/clang/AST/DeclCXX.h b/include/clang/AST/DeclCXX.h index 23da3e0283..7fd7ee6a3d 100644 --- a/include/clang/AST/DeclCXX.h +++ b/include/clang/AST/DeclCXX.h @@ -757,7 +757,7 @@ public: return isVirtualAsWritten() || (begin_overridden_methods() != end_overridden_methods()); } - + /// void addOverriddenMethod(const CXXMethodDecl *MD); diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp index 8fd6ebf5ee..a7d8216b00 100644 --- a/lib/AST/Decl.cpp +++ b/lib/AST/Decl.cpp @@ -704,6 +704,30 @@ FunctionDecl::setTemplateSpecializationKind(TemplateSpecializationKind TSK) { Info->setTemplateSpecializationKind(TSK); } +bool FunctionDecl::isOutOfLine() const { + // FIXME: Should we restrict this to member functions? + if (Decl::isOutOfLine()) + return true; + + // If this function was instantiated from a member function of a + // class template, check whether that member function was defined out-of-line. + if (FunctionDecl *FD = getInstantiatedFromMemberFunction()) { + const FunctionDecl *Definition; + if (FD->getBody(Definition)) + return Definition->isOutOfLine(); + } + + // If this function was instantiated from a function template, + // check whether that function template was defined out-of-line. + if (FunctionTemplateDecl *FunTmpl = getPrimaryTemplate()) { + const FunctionDecl *Definition; + if (FunTmpl->getTemplatedDecl()->getBody(Definition)) + return Definition->isOutOfLine(); + } + + return false; +} + //===----------------------------------------------------------------------===// // TagDecl Implementation //===----------------------------------------------------------------------===// diff --git a/lib/AST/DeclCXX.cpp b/lib/AST/DeclCXX.cpp index e8f97a383d..073ef947bf 100644 --- a/lib/AST/DeclCXX.cpp +++ b/lib/AST/DeclCXX.cpp @@ -344,7 +344,6 @@ CXXMethodDecl::Create(ASTContext &C, CXXRecordDecl *RD, isStatic, isInline); } - typedef llvm::DenseMap<const CXXMethodDecl*, std::vector<const CXXMethodDecl *> *> OverriddenMethodsMapTy; diff --git a/test/CodeGenCXX/explicit-instantiation.cpp b/test/CodeGenCXX/explicit-instantiation.cpp index 33cbf7f872..8a9e65c4e2 100644 --- a/test/CodeGenCXX/explicit-instantiation.cpp +++ b/test/CodeGenCXX/explicit-instantiation.cpp @@ -1,9 +1,6 @@ -// RUN: clang-cc -emit-llvm -femit-all-decls -o %t %s && -// RUN: grep "_ZNK4plusIillEclERKiRKl" %t | count 1 +// RUN: clang-cc -emit-llvm -triple i686-pc-linue-gnu -o %t %s && +// RUN: grep "define i32 @_ZNK4plusIillEclERKiRKl" %t | count 1 -// FIXME: We should not need the -femit-all-decls, because operator() should -// be emitted as an external symbol rather than with linkonce_odr linkage. -// This is a Sema problem. template<typename T, typename U, typename Result> struct plus { Result operator()(const T& t, const U& u) const; |