Remove getCodeBody() from Decl, and hoist getBody() into Decl as a virtual function.
llvm-svn: 54247
diff --git a/clang/include/clang/AST/Decl.h b/clang/include/clang/AST/Decl.h
index 0b9ac62..cc512ce 100644
--- a/clang/include/clang/AST/Decl.h
+++ b/clang/include/clang/AST/Decl.h
@@ -433,14 +433,11 @@
/// 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/clang/include/clang/AST/DeclBase.h b/clang/include/clang/AST/DeclBase.h
index 340474c..1560aa5 100644
--- a/clang/include/clang/AST/DeclBase.h
+++ b/clang/include/clang/AST/DeclBase.h
@@ -198,10 +198,10 @@
}
}
- // 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/clang/include/clang/AST/DeclObjC.h b/clang/include/clang/AST/DeclObjC.h
index 41a030d..413426c 100644
--- a/clang/include/clang/AST/DeclObjC.h
+++ b/clang/include/clang/AST/DeclObjC.h
@@ -228,10 +228,8 @@
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; }
