1 files changed, 6 insertions, 4 deletions
diff --git a/lib/VMCore/Instructions.cpp b/lib/VMCore/Instructions.cpp
index 8e48491..7ad588c 100644
--- a/lib/VMCore/Instructions.cpp
+++ b/lib/VMCore/Instructions.cpp
@@ -385,8 +385,9 @@ void CallInst::setParamAttrs(const ParamAttrsList *newAttrs) {
 bool CallInst::paramHasAttr(uint16_t i, ParameterAttributes attr) const {
   if (ParamAttrs && ParamAttrs->paramHasAttr(i, attr))
     return true;
-  const Function *F = getCalledFunction();
-  return F && F->getParamAttrs() && F->getParamAttrs()->paramHasAttr(i, attr);
+  if (const Function *F = getCalledFunction())
+    return F->paramHasAttr(i, attr);
+  return false;
 }
 
 
@@ -462,8 +463,9 @@ void InvokeInst::setParamAttrs(const ParamAttrsList *newAttrs) {
 bool InvokeInst::paramHasAttr(uint16_t i, ParameterAttributes attr) const {
   if (ParamAttrs && ParamAttrs->paramHasAttr(i, attr))
     return true;
-  const Function *F = getCalledFunction();
-  return F && F->getParamAttrs() && F->getParamAttrs()->paramHasAttr(i, attr);
+  if (const Function *F = getCalledFunction())
+    return F->paramHasAttr(i, attr);
+  return false;
 }