For setting attributes, don't assume there are ParamVarDecls available,

because trying to access non-existent ParamVarDecls can crash.
Testcase from the original source for PR2414.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@51960 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index 764186daf37151794f2b0c2a723951301a20e2ed..5be6872a1ecbfd307ea63504cf57b606dcf72d1d 100644 (file)
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -206,19 +206,23 @@ void CodeGenModule::SetFunctionAttributes(const FunctionDecl *FD,
     ParamAttrList.push_back(
         llvm::ParamAttrsWithIndex::get(1, llvm::ParamAttr::StructRet));
   unsigned increment = AggregateReturn ? 2 : 1;
-  for (unsigned i = 0; i < FD->getNumParams(); i++) {
-    QualType ParamType = FD->getParamDecl(i)->getType();
-    unsigned ParamAttrs = 0;
-    if (ParamType->isRecordType())
-      ParamAttrs |= llvm::ParamAttr::ByVal;
-    if (ParamType->isSignedIntegerType() && ParamType->isPromotableIntegerType())
-      ParamAttrs |= llvm::ParamAttr::SExt;
-    if (ParamType->isUnsignedIntegerType() && ParamType->isPromotableIntegerType())
-      ParamAttrs |= llvm::ParamAttr::ZExt;
-    if (ParamAttrs)
-      ParamAttrList.push_back(llvm::ParamAttrsWithIndex::get(i + increment,
-                                                             ParamAttrs));
+  const FunctionTypeProto* FTP = dyn_cast<FunctionTypeProto>(FD->getType());
+  if (FTP) {
+    for (unsigned i = 0; i < FTP->getNumArgs(); i++) {
+      QualType ParamType = FTP->getArgType(i);
+      unsigned ParamAttrs = 0;
+      if (ParamType->isRecordType())
+        ParamAttrs |= llvm::ParamAttr::ByVal;
+      if (ParamType->isSignedIntegerType() && ParamType->isPromotableIntegerType())
+        ParamAttrs |= llvm::ParamAttr::SExt;
+      if (ParamType->isUnsignedIntegerType() && ParamType->isPromotableIntegerType())
+        ParamAttrs |= llvm::ParamAttr::ZExt;
+      if (ParamAttrs)
+        ParamAttrList.push_back(llvm::ParamAttrsWithIndex::get(i + increment,
+                                                               ParamAttrs));
+    }
   }
+
   F->setParamAttrs(llvm::PAListPtr::get(ParamAttrList.begin(),
                                         ParamAttrList.size()));
 

diff --git a/test/CodeGen/typedef-func.c b/test/CodeGen/typedef-func.c
index 08328e67700d7a0b6ff072e647f774e79a30a20f..c14a42c1e8ad0f5df7d4f55125ad6165b7245694 100644 (file)
--- a/test/CodeGen/typedef-func.c
+++ b/test/CodeGen/typedef-func.c
@@ -1,13 +1,16 @@
 // RUN: clang -emit-llvm < %s
 
 // PR2414
-typedef void filter_func_t();
+struct mad_frame{};
+enum mad_flow {};
+
+typedef enum mad_flow filter_func_t(void *, struct mad_frame *);
+
 filter_func_t mono_filter;
 
 void addfilter2(filter_func_t *func){}
 
 void setup_filters()
 {
-        addfilter2( mono_filter);
+  addfilter2( mono_filter);
 }
-