commit 335830555806629d53c00a80ec3ecb61ead86f03
author Devang Patel <dpatel@apple.com> Thu Jan 28 23:15:27 2010 +0000
committer Devang Patel <dpatel@apple.com> Thu Jan 28 23:15:27 2010 +0000
tree 70ddcc4e95a745af29f606e9df779f5d9e98c6e6
parent ca7daeddfad1be5a517ff93649af7de8d4c6b50b

s/CGDebugInfo::getContext/CGDebugInfo::getContextDescriptor/g to avoid confusion.


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

lib/CodeGen/CGDebugInfo.cpp

diff --git a/lib/CodeGen/CGDebugInfo.cpp b/lib/CodeGen/CGDebugInfo.cpp
index 2840ee6..3597098 100644
--- a/lib/CodeGen/CGDebugInfo.cpp
+++ b/lib/CodeGen/CGDebugInfo.cpp
@@ -49,9 +49,9 @@
     CurLoc = CGM.getContext().getSourceManager().getInstantiationLoc(Loc);
 }
 
-/// getContext - Get context info for the decl.
-llvm::DIDescriptor CGDebugInfo::getContext(const VarDecl *Decl,
-                                           llvm::DIDescriptor &CompileUnit) {
+/// getContextDescriptor - Get context info for the decl.
+llvm::DIDescriptor CGDebugInfo::getContextDescriptor(const VarDecl *Decl,
+                                              llvm::DIDescriptor &CompileUnit) {
   if (Decl->isFileVarDecl())
     return CompileUnit;
   if (Decl->getDeclContext()->isFunctionOrMethod()) {
@@ -1770,8 +1770,8 @@
                                            ArrayType::Normal, 0);
   }
   llvm::StringRef DeclName = Decl->getName();
-  DebugFactory.CreateGlobalVariable(getContext(Decl, Unit), DeclName, DeclName,
-                                    llvm::StringRef(), Unit, LineNo,
+  DebugFactory.CreateGlobalVariable(getContextDescriptor(Decl, Unit), DeclName,
+                                    DeclName, llvm::StringRef(), Unit, LineNo,
                                     getOrCreateType(T, Unit),
                                     Var->hasInternalLinkage(),
                                     true/*definition*/, Var);