De-virtualize Decl::isOutOfLine().
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@125730 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 9aeb04f..fded8ff 100644
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -1159,7 +1159,7 @@
}
bool VarDecl::isOutOfLine() const {
- if (Decl::isOutOfLine())
+ if (getLexicalDeclContext() != getDeclContext())
return true;
if (!isStaticDataMember())
@@ -1883,7 +1883,7 @@
}
bool FunctionDecl::isOutOfLine() const {
- if (Decl::isOutOfLine())
+ if (getLexicalDeclContext() != getDeclContext())
return true;
// If this function was instantiated from a member function of a
diff --git a/lib/AST/DeclBase.cpp b/lib/AST/DeclBase.cpp
index e16bd22..a95ea3f 100644
--- a/lib/AST/DeclBase.cpp
+++ b/lib/AST/DeclBase.cpp
@@ -172,6 +172,15 @@
// Out-of-line virtual method providing a home for Decl.
Decl::~Decl() { }
+bool Decl::isOutOfLine() const {
+ if (const VarDecl *VD = dyn_cast<VarDecl>(this))
+ return VD->isOutOfLine();
+ if (const FunctionDecl *FD = dyn_cast<FunctionDecl>(this))
+ return FD->isOutOfLine();
+
+ return getLexicalDeclContext() != getDeclContext();
+}
+
void Decl::setDeclContext(DeclContext *DC) {
if (isOutOfSemaDC())
delete getMultipleDC();