Remove getCodeBody() from Decl, and hoist getBody() into Decl as a virtual function.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@54247 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 0b9ac624505a50545ea92aa9765253229e44e88f..cc512ce2104fa2955b42fcdaa33cc7fe6152e0f3 100644 (file)
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -433,14 +433,11 @@ public:
   /// set that function declaration to the actual declaration
   /// containing the body (if there is one).
   Stmt *getBody(const FunctionDecl *&Definition) const;
-  Stmt *getBody() const { 
+
+  virtual Stmt *getBody() const { 
     const FunctionDecl* Definition;
     return getBody(Definition);
   }
-
-  virtual Stmt* getCodeBody() const {
-    return getBody();
-  }
   
   /// isThisDeclarationADefinition - Returns whether this specific
   /// declaration of the function is also a definition. This does not

diff --git a/include/clang/AST/DeclBase.h b/include/clang/AST/DeclBase.h
index 340474cdfaa4fe2d1bc3f47cf199cea22c633f9d..1560aa585dda68e8002d5f6871511cd3d98c49af 100644 (file)
--- a/include/clang/AST/DeclBase.h
+++ b/include/clang/AST/DeclBase.h
@@ -198,10 +198,10 @@ public:
     }
   }
   
-  // getCodeBody - If this Decl represents a declaration for a body of code,
+  // getBody - If this Decl represents a declaration for a body of code,
   //  such as a function or method definition, this method returns the top-level
-  //  Stmt* of that body.  Otherwise this method returns null.
-  virtual Stmt* getCodeBody() const { return 0; }
+  //  Stmt* of that body.  Otherwise this method returns null.  
+  virtual Stmt* getBody() const { return 0; }
   
   // global temp stats (until we have a per-module visitor)
   static void addDeclKind(Kind k);

diff --git a/include/clang/AST/DeclObjC.h b/include/clang/AST/DeclObjC.h
index 41a030d0e008f00b7dcae67681299a0790859662..413426c6a79110acd30c16be362316fc9cb948cd 100644 (file)
--- a/include/clang/AST/DeclObjC.h
+++ b/include/clang/AST/DeclObjC.h
@@ -228,10 +228,8 @@ public:
     return ImplementationControl(DeclImplementation); 
   }
 
-  Stmt *getBody() const { return Body; }
+  virtual Stmt *getBody() const { return Body; }
   void setBody(Stmt *B) { Body = B; }
-  
-  virtual Stmt* getCodeBody() const { return getBody(); }
 
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { return D->getKind() == ObjCMethod; }