diff options
| -rw-r--r-- | include/llvm/Instructions.h | 19 | ||||
| -rw-r--r-- | include/llvm/Support/CallSite.h | 5 |
2 files changed, 13 insertions, 11 deletions
diff --git a/include/llvm/Instructions.h b/include/llvm/Instructions.h index b52ebd9aca..892feaa2c4 100644 --- a/include/llvm/Instructions.h +++ b/include/llvm/Instructions.h @@ -481,10 +481,12 @@ public: virtual CallInst *clone() const; bool mayWriteToMemory() const { return true; } - // FIXME: These methods should be inline once we eliminate - // ConstantPointerRefs! - const Function *getCalledFunction() const; - Function *getCalledFunction(); + /// getCalledFunction - Return the function being called by this instruction + /// if it is a direct call. If it is a call through a function pointer, + /// return null. + Function *getCalledFunction() const { + return dyn_cast<Function>(Operands[0]); + } // getCalledValue - Get a pointer to a method that is invoked by this inst. inline const Value *getCalledValue() const { return Operands[0]; } @@ -1088,12 +1090,11 @@ public: bool mayWriteToMemory() const { return true; } /// getCalledFunction - Return the function called, or null if this is an - /// indirect function invocation... - /// - /// FIXME: These should be inlined once we get rid of ConstantPointerRefs! + /// indirect function invocation. /// - const Function *getCalledFunction() const; - Function *getCalledFunction(); + Function *getCalledFunction() const { + return dyn_cast<Function>(Operands[0]); + } // getCalledValue - Get a pointer to a function that is invoked by this inst. inline const Value *getCalledValue() const { return Operands[0]; } diff --git a/include/llvm/Support/CallSite.h b/include/llvm/Support/CallSite.h index 93442639b5..1efc34e56a 100644 --- a/include/llvm/Support/CallSite.h +++ b/include/llvm/Support/CallSite.h @@ -74,8 +74,9 @@ public: /// getCalledFunction - Return the function being called if this is a direct /// call, otherwise return null (if it's an indirect call). /// - /// FIXME: This should be inlined once ConstantPointerRefs are gone. :( - Function *getCalledFunction() const; + Function *getCalledFunction() const { + return dyn_cast<Function>(getCalledValue()); + } /// setCalledFunction - Set the callee to the specified value... /// |