[cfe-commits] r73651 - in /cfe/trunk: include/clang/AST/DeclBase.h include/clang/AST/DeclCXX.h lib/CodeGen/CodeGenModule.cpp lib/Frontend/ASTConsumers.cpp lib/Sema/SemaDecl.cpp

[Argiris Kirtzidis]

Author: akirtzidis
Date: Wed Jun 17 17:49:50 2009
New Revision: 73651

URL: http://llvm.org/viewvc/llvm-project?rev=73651&view=rev
Log:
Move CXXMethodDecl::OutOfLineDefinition into Decl::OutOfLine.

Modified:
    cfe/trunk/include/clang/AST/DeclBase.h
    cfe/trunk/include/clang/AST/DeclCXX.h
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp
    cfe/trunk/lib/Frontend/ASTConsumers.cpp
    cfe/trunk/lib/Sema/SemaDecl.cpp

Modified: cfe/trunk/include/clang/AST/DeclBase.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclBase.h?rev=73651&r1=73650&r2=73651&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/DeclBase.h (original)
+++ cfe/trunk/include/clang/AST/DeclBase.h Wed Jun 17 17:49:50 2009
@@ -268,6 +268,10 @@
   const DeclContext *getLexicalDeclContext() const {
     return const_cast<Decl*>(this)->getLexicalDeclContext();
   }
+
+  bool isOutOfLine() const {
+    return getLexicalDeclContext() != getDeclContext();
+  }
   
   /// setDeclContext - Set both the semantic and lexical DeclContext
   /// to DC.

Modified: cfe/trunk/include/clang/AST/DeclCXX.h
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/AST/DeclCXX.h?rev=73651&r1=73650&r2=73651&view=diff

==============================================================================
--- cfe/trunk/include/clang/AST/DeclCXX.h (original)
+++ cfe/trunk/include/clang/AST/DeclCXX.h Wed Jun 17 17:49:50 2009
@@ -477,10 +477,6 @@
   bool isStatic() const { return getStorageClass() == Static; }
   bool isInstance() const { return !isStatic(); }
 
-  bool isOutOfLineDefinition() const {
-    return getLexicalDeclContext() != getDeclContext();
-  }
-
   bool isVirtual() const { 
     return isVirtualAsWritten() ||
       (begin_overridden_methods() != end_overridden_methods());

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=73651&r1=73650&r2=73651&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Wed Jun 17 17:49:50 2009
@@ -244,7 +244,7 @@
 GetLinkageForFunction(const FunctionDecl *FD, const LangOptions &Features) {
   if (const CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(FD)) {
     // C++ member functions defined inside the class are always inline.
-    if (MD->isInline() || !MD->isOutOfLineDefinition())
+    if (MD->isInline() || !MD->isOutOfLine())
       return CodeGenModule::GVA_CXXInline;
     
     return CodeGenModule::GVA_StrongExternal;

Modified: cfe/trunk/lib/Frontend/ASTConsumers.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/ASTConsumers.cpp?rev=73651&r1=73650&r2=73651&view=diff

==============================================================================
--- cfe/trunk/lib/Frontend/ASTConsumers.cpp (original)
+++ cfe/trunk/lib/Frontend/ASTConsumers.cpp Wed Jun 17 17:49:50 2009
@@ -243,7 +243,7 @@
   }
   case Decl::CXXMethod: {
     const CXXMethodDecl* D = cast<CXXMethodDecl>(DC);
-    if (D->isOutOfLineDefinition())
+    if (D->isOutOfLine())
       Out << "[c++ method] ";
     else if (D->isImplicit())
       Out << "(c++ method) ";
@@ -273,7 +273,7 @@
   }
   case Decl::CXXConstructor: {
     const CXXConstructorDecl* D = cast<CXXConstructorDecl>(DC);
-    if (D->isOutOfLineDefinition())
+    if (D->isOutOfLine())
       Out << "[c++ ctor] ";
     else if (D->isImplicit())
       Out << "(c++ ctor) ";
@@ -302,7 +302,7 @@
   }
   case Decl::CXXDestructor: {
     const CXXDestructorDecl* D = cast<CXXDestructorDecl>(DC);
-    if (D->isOutOfLineDefinition())
+    if (D->isOutOfLine())
       Out << "[c++ dtor] ";
     else if (D->isImplicit())
       Out << "(c++ dtor) ";
@@ -318,7 +318,7 @@
   }
   case Decl::CXXConversion: {
     const CXXConversionDecl* D = cast<CXXConversionDecl>(DC);
-    if (D->isOutOfLineDefinition())
+    if (D->isOutOfLine())
       Out << "[c++ conversion] ";
     else if (D->isImplicit())
       Out << "(c++ conversion) ";

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=73651&r1=73650&r2=73651&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Wed Jun 17 17:49:50 2009
@@ -183,7 +183,7 @@
 DeclContext *Sema::getContainingDC(DeclContext *DC) {
   if (CXXMethodDecl *MD = dyn_cast<CXXMethodDecl>(DC)) {
     // A C++ out-of-line method will return to the file declaration context.
-    if (MD->isOutOfLineDefinition())
+    if (MD->isOutOfLine())
       return MD->getLexicalDeclContext();
 
     // A C++ inline method is parsed *after* the topmost class it was declared