Rename ScopedDecl::getContext() -> getContextDecl(). Two motivations:

#1: To be consistent with FieldDecl::getContextDecl(), which serves the same purpose.
#2: From my perspective, getContext() is too general (and used by several other classes for different purposes).

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

diff --git a/include/clang/AST/Decl.h b/include/clang/AST/Decl.h
index 8197e46c87408f1df642fa89c8ebbc74d97b479e..d0cd999f9a9af49adf05c919e14c523e9e1824fe 100644 (file)
--- a/include/clang/AST/Decl.h
+++ b/include/clang/AST/Decl.h
@@ -66,7 +66,7 @@ protected:
     : NamedDecl(DK, L, Id), NextDeclarator(PrevDecl), Next(0), CtxDecl(CD) {}
   
 public:
-  ContextDecl *getContext() const { return CtxDecl; }
+  ContextDecl *getContextDecl() const { return CtxDecl; }
 
   ScopedDecl *getNext() const { return Next; }
   void setNext(ScopedDecl *N) { Next = N; }
@@ -83,8 +83,8 @@ public:
   // roughly global variables and functions, but also handles enums (which could
   // be defined inside or outside a function etc).
   bool isDefinedOutsideFunctionOrMethod() const {
-    if (getContext())
-      return !getContext()->isFunctionOrMethod();
+    if (getContextDecl())
+      return !getContextDecl()->isFunctionOrMethod();
     else
       return true;
   }

diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
index 38a20c1c015ee9f0da2b234c7819d6040fc6c15c..b1a2499949c0fdc2deee58ba6143db0a6e7c2b99 100644 (file)
--- a/lib/AST/Decl.cpp
+++ b/lib/AST/Decl.cpp
@@ -335,7 +335,7 @@ const Attr *Decl::getAttrs() const {
 
 ContextDecl *ContextDecl::getParent() const {
   if (ScopedDecl *SD = dyn_cast<ScopedDecl>(this))
-    return SD->getContext();
+    return SD->getContextDecl();
   else
     return NULL;
 }

diff --git a/lib/AST/DeclSerialization.cpp b/lib/AST/DeclSerialization.cpp
index 3a79b9e0e292983822f892d2ca1b1798dba4aa7b..e6b3f93096ce4074329fdff1939de094ca79297c 100644 (file)
--- a/lib/AST/DeclSerialization.cpp
+++ b/lib/AST/DeclSerialization.cpp
@@ -106,7 +106,7 @@ void NamedDecl::ReadInRec(Deserializer& D) {
 void ScopedDecl::EmitInRec(Serializer& S) const {
   NamedDecl::EmitInRec(S);
   S.EmitPtr(getNext());                     // From ScopedDecl.  
-  S.EmitPtr(cast_or_null<Decl>(getContext()));  // From ScopedDecl.
+  S.EmitPtr(cast_or_null<Decl>(getContextDecl()));  // From ScopedDecl.
 }
 
 void ScopedDecl::ReadInRec(Deserializer& D) {