diff --git a/llvm/include/llvm/Instructions.h b/llvm/include/llvm/Instructions.h
index 82b138183a77..3aa8d6879c2f 100644
--- a/llvm/include/llvm/Instructions.h
+++ b/llvm/include/llvm/Instructions.h
@@ -1420,13 +1420,17 @@ public:
 
   virtual ReturnInst *clone() const;
 
-  Value *getReturnValue(unsigned n = 0) const {
+  Value *getOperand(unsigned n = 0) const {
     if (getNumOperands() > 1)
-      return getOperand(n);
+      return TerminatorInst::getOperand(n);
     else
       return RetVal;
   }
 
+  Value *getReturnValue(unsigned n = 0) const {
+    return getOperand(n);
+  }
+
   unsigned getNumSuccessors() const { return 0; }
 
   // Methods for support type inquiry through isa, cast, and dyn_cast: