diff --git a/include/llvm/IntrinsicInst.h b/include/llvm/IntrinsicInst.h
index da1bc4ddce6..b82fa02370c 100644
--- a/include/llvm/IntrinsicInst.h
+++ b/include/llvm/IntrinsicInst.h
@@ -163,7 +163,7 @@ namespace llvm {
   /// DbgDeclareInst - This represents the llvm.dbg.declare instruction.
   ///
   struct DbgDeclareInst : public DbgInfoIntrinsic {
-    Value *getAllocA() const { return StripCast(getOperand(1)); }
+    Value *getAddress()  const { return StripCast(getOperand(1)); }
     Value *getVariable() const { return StripCast(getOperand(2)); }
 
     // Methods for support type inquiry through isa, cast, and dyn_cast:
diff --git a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
index 30871dd4e11..d0003fd0ee3 100644
--- a/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAGISel.cpp
@@ -1187,8 +1187,8 @@ SelectionDAGLowering::visitIntrinsicCall(CallInst &I, unsigned Intrinsic) {
     if (DebugInfo && DebugInfo->Verify(DI.getVariable())) {
       std::vector<SDOperand> Ops;
 
-      SDOperand AllocaOp  = getValue(I.getOperand(1));
-      if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(AllocaOp)) {
+      SDOperand AddressOp  = getValue(DI.getAddress());
+      if (FrameIndexSDNode *FI = dyn_cast<FrameIndexSDNode>(AddressOp)) {
         DebugInfo->RecordVariable(DI.getVariable(), FI->getIndex());
       }
     }