Fix PR1146: parameter attributes are longer part of

the function type, instead they belong to functions
and function calls.  This is an updated and slightly
corrected version of Reid Spencer's original patch.
The only known problem is that auto-upgrading of
bitcode files doesn't seem to work properly (see
test/Bitcode/AutoUpgradeIntrinsics.ll).  Hopefully
a bitcode guru (who might that be? :) ) will fix it.

llvm-svn: 44359

1 files changed, 4 insertions, 14 deletions

diff --git a/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp b/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
index 3717a161aef..22d81c881ec 100644
--- a/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Scalar/SimplifyCFG.cpp
@@ -96,16 +96,11 @@ static bool IsNoReturn(const CallInst *CI) {
     if (Attrs->paramHasAttr(0, ParamAttr::NoReturn))
       return true;
   
-  if (const Function *Callee = CI->getCalledFunction()) {
+  if (const Function *Callee = CI->getCalledFunction())
     if (const ParamAttrsList *Attrs = Callee->getParamAttrs())
       if (Attrs->paramHasAttr(0, ParamAttr::NoReturn))
         return true;
-  
-    const FunctionType *FT = Callee->getFunctionType();
-    if (const ParamAttrsList *Attrs = FT->getParamAttrs())
-      if (Attrs->paramHasAttr(0, ParamAttr::NoReturn))
-        return true;
-  }
+
   return false;
 }
 
@@ -115,16 +110,11 @@ static bool IsNoUnwind(const InvokeInst *II) {
     if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind))
       return true;
   
-  if (const Function *Callee = II->getCalledFunction()) {
+  if (const Function *Callee = II->getCalledFunction())
     if (const ParamAttrsList *Attrs = Callee->getParamAttrs())
       if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind))
         return true;
-  
-    const FunctionType *FT = Callee->getFunctionType();
-    if (const ParamAttrsList *Attrs = FT->getParamAttrs())
-      if (Attrs->paramHasAttr(0, ParamAttr::NoUnwind))
-        return true;
-  }
+
   return false;
 }