[cfe-commits] r47838 - in /cfe/trunk: CodeGen/CodeGenFunction.cpp test/CodeGen/attributes.c

[Chris Lattner]

Author: lattner
Date: Sun Mar  2 21:45:26 2008
New Revision: 47838

URL: http://llvm.org/viewvc/llvm-project?rev=47838&view=rev
Log:
fix codegen support for functions that are nothrow and noreturn.

Modified:
    cfe/trunk/CodeGen/CodeGenFunction.cpp
    cfe/trunk/test/CodeGen/attributes.c

Modified: cfe/trunk/CodeGen/CodeGenFunction.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CodeGen/CodeGenFunction.cpp?rev=47838&r1=47837&r2=47838&view=diff

==============================================================================
--- cfe/trunk/CodeGen/CodeGenFunction.cpp (original)
+++ cfe/trunk/CodeGen/CodeGenFunction.cpp Sun Mar  2 21:45:26 2008
@@ -82,18 +82,17 @@
   // 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);
   

Modified: cfe/trunk/test/CodeGen/attributes.c
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGen/attributes.c?rev=47838&r1=47837&r2=47838&view=diff

==============================================================================
--- cfe/trunk/test/CodeGen/attributes.c (original)
+++ cfe/trunk/test/CodeGen/attributes.c Sun Mar  2 21:45:26 2008
@@ -19,3 +19,8 @@
 
 // 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() {}