2 files changed, 13 insertions, 9 deletions
diff --git a/clang/CodeGen/CodeGenFunction.cpp b/clang/CodeGen/CodeGenFunction.cpp
index 6701b71f097..adbb414cc09 100644
--- a/clang/CodeGen/CodeGenFunction.cpp
+++ b/clang/CodeGen/CodeGenFunction.cpp
@@ -82,18 +82,17 @@ void CodeGenFunction::GenerateCode(const FunctionDecl *FD) {
   // FIXME: else handle -fvisibility
 
 
-  llvm::ParamAttrsVector ParamAttrsVec;
-
+  unsigned FuncAttrs = 0;
   if (FD->getAttr<NoThrowAttr>())
-    ParamAttrsVec.push_back(
-     llvm::ParamAttrsWithIndex::get(ParamAttrsVec.size(), llvm::ParamAttr::NoUnwind));
+    FuncAttrs |= llvm::ParamAttr::NoUnwind;
   if (FD->getAttr<NoReturnAttr>())
-    ParamAttrsVec.push_back(
-     llvm::ParamAttrsWithIndex::get(ParamAttrsVec.size(), llvm::ParamAttr::NoReturn));
-
-  if (!ParamAttrsVec.empty())
+    FuncAttrs |= llvm::ParamAttr::NoReturn;
+  
+  if (FuncAttrs) {
+    llvm::ParamAttrsVector ParamAttrsVec;
+    ParamAttrsVec.push_back(llvm::ParamAttrsWithIndex::get(0, FuncAttrs));
     CurFn->setParamAttrs(llvm::ParamAttrsList::get(ParamAttrsVec));
-
+  }
 
   llvm::BasicBlock *EntryBB = new llvm::BasicBlock("entry", CurFn);
   
diff --git a/clang/test/CodeGen/attributes.c b/clang/test/CodeGen/attributes.c
index 59f3e73297b..73e0601894d 100644
--- a/clang/test/CodeGen/attributes.c
+++ b/clang/test/CodeGen/attributes.c
@@ -19,3 +19,8 @@ int t5 __attribute__((weak)) = 2;
 
 // RUN: clang -emit-llvm < %s | grep 't6.*protected'
 int t6 __attribute__((visibility(protected)));
+
+// RUN: clang -emit-llvm < %s | grep 't7.*noreturn'
+// RUN: clang -emit-llvm < %s | grep 't7.*nothrow'
+void t7() __attribute__((noreturn, nothrow));
+void t7() {}