aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEli Friedman <eli.friedman@gmail.com>2011-03-24 05:09:45 +0000
committerEli Friedman <eli.friedman@gmail.com>2011-03-24 05:09:45 +0000
commitc285372e69f42d95ca638d74abd1f46bd7b77a96 (patch)
tree89f4ede534d6d65c108056dac6cb3d3fe420cd6f
parent4230d529a8797bbeef2328b60abeae333f7e143f (diff)
Make sure we aggressively attach nounwind (etc.) to calls to library
functions of the form __builtin_XXX. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@128198 91177308-0d34-0410-b5e6-96231b3b80d8
-rw-r--r--lib/CodeGen/CGBuiltin.cpp3
-rw-r--r--test/CodeGen/builtin-attributes.c5
2 files changed, 6 insertions, 2 deletions
diff --git a/lib/CodeGen/CGBuiltin.cpp b/lib/CodeGen/CGBuiltin.cpp
index 7e61b50c93..e6b6ee92c0 100644
--- a/lib/CodeGen/CGBuiltin.cpp
+++ b/lib/CodeGen/CGBuiltin.cpp
@@ -948,8 +948,7 @@ RValue CodeGenFunction::EmitBuiltinExpr(const FunctionDecl *FD,
getContext().BuiltinInfo.isPredefinedLibFunction(BuiltinID))
return EmitCall(E->getCallee()->getType(),
CGM.getBuiltinLibFunction(FD, BuiltinID),
- ReturnValueSlot(),
- E->arg_begin(), E->arg_end());
+ ReturnValueSlot(), E->arg_begin(), E->arg_end(), FD);
// See if we have a target specific intrinsic.
const char *Name = getContext().BuiltinInfo.GetName(BuiltinID);
diff --git a/test/CodeGen/builtin-attributes.c b/test/CodeGen/builtin-attributes.c
index afde3fab84..822b8eecf7 100644
--- a/test/CodeGen/builtin-attributes.c
+++ b/test/CodeGen/builtin-attributes.c
@@ -10,3 +10,8 @@ void f0() {
void f1() {
exit(1);
}
+
+// CHECK: call i8* @strstr{{.*}} nounwind
+char* f2(char* a, char* b) {
+ return __builtin_strstr(a, b);
+}