4 files changed, 17 insertions, 7 deletions
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
index e8431c11061..7140e808efa 100644
--- a/clang/include/clang/AST/Decl.h
+++ b/clang/include/clang/AST/Decl.h
@@ -787,7 +787,7 @@ public:
 
   /// \brief Determine whether this is or was instantiated from an out-of-line 
   /// definition of a static data member.
-  virtual bool isOutOfLine() const;
+  bool isOutOfLine() const;
 
   /// \brief If this is a static data member, find its out-of-line definition.
   VarDecl *getOutOfLineDefinition();
@@ -1690,7 +1690,7 @@ public:
                        
   /// \brief Determine whether this is or was instantiated from an out-of-line 
   /// definition of a member function.
-  virtual bool isOutOfLine() const;
+  bool isOutOfLine() const;
                        
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { return classofKind(D->getKind()); }
diff --git a/clang/include/clang/AST/DeclBase.h b/clang/include/clang/AST/DeclBase.h
index e99d54771ab..472cb3bb747 100644
--- a/clang/include/clang/AST/DeclBase.h
+++ b/clang/include/clang/AST/DeclBase.h
@@ -459,9 +459,10 @@ public:
     return const_cast<Decl*>(this)->getLexicalDeclContext();
   }
 
-  virtual bool isOutOfLine() const {
-    return getLexicalDeclContext() != getDeclContext();
-  }
+  /// \brief Determine whether this declaration was written out-of-line, which
+  /// typically indicates that it was written with a qualified name in a scope
+  /// outside of its semantic scope.
+  bool isOutOfLine() const;
 
   /// setDeclContext - Set both the semantic and lexical DeclContext
   /// to DC.
diff --git a/clang/lib/AST/Decl.cpp b/clang/lib/AST/Decl.cpp
index 9aeb04fa448..fded8ff38c1 100644
--- a/clang/lib/AST/Decl.cpp
+++ b/clang/lib/AST/Decl.cpp
@@ -1159,7 +1159,7 @@ const Expr *VarDecl::getAnyInitializer(const VarDecl *&D) const {
 }
 
 bool VarDecl::isOutOfLine() const {
-  if (Decl::isOutOfLine())
+  if (getLexicalDeclContext() != getDeclContext())
     return true;
 
   if (!isStaticDataMember())
@@ -1883,7 +1883,7 @@ SourceLocation FunctionDecl::getPointOfInstantiation() const {
 }
 
 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/clang/lib/AST/DeclBase.cpp b/clang/lib/AST/DeclBase.cpp
index e16bd22f336..a95ea3f6463 100644
--- a/clang/lib/AST/DeclBase.cpp
+++ b/clang/lib/AST/DeclBase.cpp
@@ -172,6 +172,15 @@ void PrettyStackTraceDecl::print(llvm::raw_ostream &OS) const {
 // 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();