diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
index 71a03303b3e..abca6836e31 100644
--- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp
@@ -192,9 +192,10 @@ void CompileUnit::addSourceLine(DIE *Die, DINameSpace NS) {
   addUInt(Die, dwarf::DW_AT_decl_line, 0, Line);
 }
 
-/// addVariableAddress - Add DW_AT_location attribute for a DbgVariable based
-/// on provided frame index.
-void CompileUnit::addVariableAddress(DbgVariable *&DV, DIE *Die, int64_t FI) {
+/// addFrameVariableAddress - Add DW_AT_location attribute for a 
+/// DbgVariable based on provided frame index.
+void CompileUnit::addFrameVariableAddress(DbgVariable *&DV, DIE *Die, 
+                                          int64_t FI) {
   MachineLocation Location;
   unsigned FrameReg;
   const TargetFrameLowering *TFI = Asm->TM.getFrameLowering();
diff --git a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
index c8f0d469ff4..739460bea8e 100644
--- a/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
+++ b/lib/CodeGen/AsmPrinter/DwarfCompileUnit.h
@@ -212,9 +212,9 @@ public:
   void addBlockByrefAddress(DbgVariable *&DV, DIE *Die, unsigned Attribute,
                             const MachineLocation &Location);
 
-  /// addVariableAddress - Add DW_AT_location attribute for a DbgVariable based
-  /// on provided frame index.
-  void addVariableAddress(DbgVariable *&DV, DIE *Die, int64_t FI);
+  /// addFrameVariableAddress - Add DW_AT_location attribute for a DbgVariable 
+  /// based on provided frame index.
+  void addFrameVariableAddress(DbgVariable *&DV, DIE *Die, int64_t FI);
 
   /// addToContextOwner - Add Die into the list of its context owner's children.
   void addToContextOwner(DIE *Die, DIDescriptor Context);
diff --git a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
index 325c3d34a55..7d95c4b83af 100644
--- a/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
+++ b/lib/CodeGen/AsmPrinter/DwarfDebug.cpp
@@ -696,7 +696,8 @@ DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV, DbgScope *Scope) {
         const TargetRegisterInfo *TRI = Asm->TM.getRegisterInfo();
         if (DVInsn->getOperand(1).isImm() &&
             TRI->getFrameRegister(*Asm->MF) == RegOp.getReg()) {
-          TheCU->addVariableAddress(DV, VariableDie, DVInsn->getOperand(1).getImm());
+          TheCU->addFrameVariableAddress(DV, VariableDie, 
+                                         DVInsn->getOperand(1).getImm());
           updated = true;
         } else
           updated = TheCU->addRegisterAddress(VariableDie, RegOp);
@@ -730,7 +731,7 @@ DIE *DwarfDebug::constructVariableDIE(DbgVariable *DV, DbgScope *Scope) {
   // .. else use frame index, if available.
   int FI = 0;
   if (findVariableFrameIndex(DV, &FI))
-    TheCU->addVariableAddress(DV, VariableDie, FI);
+    TheCU->addFrameVariableAddress(DV, VariableDie, FI);
   
   DV->setDIE(VariableDie);
   return VariableDie;