gchatelet created this revision. gchatelet added reviewers: aaron.ballman, courbet. Herald added a project: clang. Herald added a subscriber: cfe-commits.
This is a follow up on https://reviews.llvm.org/D61634#1742154 to turn the clang driver -fno-builtin flag into an IR attribute. I also investigated pushing the attribute earlier on (in Sema) but it looks like this patch is simple and will cover all function calls. Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D71193 Files: clang/lib/CodeGen/CGCall.cpp clang/test/CodeGen/libcalls-fno-builtin.c clang/test/CodeGen/memccpy-libcall.c
Index: clang/test/CodeGen/memccpy-libcall.c =================================================================== --- clang/test/CodeGen/memccpy-libcall.c +++ clang/test/CodeGen/memccpy-libcall.c @@ -9,4 +9,4 @@ memccpy(d, s, c, n); } -// CHECK: attributes #2 = { nobuiltin } +// CHECK: attributes #2 = { nobuiltin "no-builtin-memccpy" } Index: clang/test/CodeGen/libcalls-fno-builtin.c =================================================================== --- clang/test/CodeGen/libcalls-fno-builtin.c +++ clang/test/CodeGen/libcalls-fno-builtin.c @@ -1,4 +1,4 @@ -// RUN: %clang_cc1 -S -emit-llvm -fno-builtin -o - %s | FileCheck %s +// RUN: %clang_cc1 -S -emit-llvm -fno-builtin -o - %s | FileCheck --check-prefixes=GLOBAL,CHECK %s // RUN: %clang_cc1 -S -emit-llvm -fno-builtin-ceil -fno-builtin-copysign -fno-builtin-cos \ // RUN: -fno-builtin-fabs -fno-builtin-floor -fno-builtin-strcat -fno-builtin-strncat \ // RUN: -fno-builtin-strchr -fno-builtin-strrchr -fno-builtin-strcmp -fno-builtin-strncmp \ @@ -6,7 +6,7 @@ // RUN: -fno-builtin-strpbrk -fno-builtin-strspn -fno-builtin-strtod -fno-builtin-strtof \ // RUN: -fno-builtin-strtold -fno-builtin-strtol -fno-builtin-strtoll -fno-builtin-strtoul \ // RUN: -fno-builtin-strtoull -fno-builtin-fread -fno-builtin-fwrite -fno-builtin-fopen \ -// RUN: -o - %s | FileCheck %s +// RUN: -o - %s | FileCheck --check-prefixes=INDIVIDUAL,CHECK %s // RUN: %clang_cc1 -S -O3 -fno-builtin -o - %s | FileCheck --check-prefix=ASM %s // RUN: %clang_cc1 -S -O3 -fno-builtin-ceil -o - %s | FileCheck --check-prefix=ASM-INDIV %s @@ -56,108 +56,109 @@ double t2(double x, double y) { return copysign(x,y); } // CHECK-LABEL: t2 -// CHECK: call{{.*}}@copysign{{.*}} [[ATTR]] +// CHECK: call{{.*}}@copysign{{.*}} #2 double t3(double x) { return cos(x); } // CHECK-LABEL: t3 -// CHECK: call{{.*}}@cos{{.*}} [[ATTR]] +// CHECK: call{{.*}}@cos{{.*}} #2 double t4(double x) { return fabs(x); } // CHECK-LABEL: t4 -// CHECK: call{{.*}}@fabs{{.*}} [[ATTR]] +// CHECK: call{{.*}}@fabs{{.*}} #2 double t5(double x) { return floor(x); } // CHECK-LABEL: t5 -// CHECK: call{{.*}}@floor{{.*}} [[ATTR]] +// CHECK: call{{.*}}@floor{{.*}} #2 char *t6(char *x) { return strcat(x, ""); } // CHECK-LABEL: t6 -// CHECK: call{{.*}}@strcat{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strcat{{.*}} #2 char *t7(char *x) { return strncat(x, "", 1); } // CHECK-LABEL: t7 -// CHECK: call{{.*}}@strncat{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strncat{{.*}} #2 char *t8(void) { return strchr("hello, world", 'w'); } // CHECK-LABEL: t8 -// CHECK: call{{.*}}@strchr{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strchr{{.*}} #2 char *t9(void) { return strrchr("hello, world", 'w'); } // CHECK-LABEL: t9 -// CHECK: call{{.*}}@strrchr{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strrchr{{.*}} #2 int t10(void) { return strcmp("foo", "bar"); } // CHECK-LABEL: t10 -// CHECK: call{{.*}}@strcmp{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strcmp{{.*}} #2 int t11(void) { return strncmp("foo", "bar", 3); } // CHECK-LABEL: t11 -// CHECK: call{{.*}}@strncmp{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strncmp{{.*}} #2 char *t12(char *x) { return strcpy(x, "foo"); } // CHECK-LABEL: t12 -// CHECK: call{{.*}}@strcpy{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strcpy{{.*}} #2 char *t13(char *x) { return stpcpy(x, "foo"); } // CHECK-LABEL: t13 -// CHECK: call{{.*}}@stpcpy{{.*}} [[ATTR]] +// CHECK: call{{.*}}@stpcpy{{.*}} #2 char *t14(char *x) { return strncpy(x, "foo", 3); } // CHECK-LABEL: t14 -// CHECK: call{{.*}}@strncpy{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strncpy{{.*}} #2 size_t t15(void) { return strlen("foo"); } // CHECK-LABEL: t15 -// CHECK: call{{.*}}@strlen{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strlen{{.*}} #2 char *t16(char *x) { return strpbrk(x, ""); } // CHECK-LABEL: t16 -// CHECK: call{{.*}}@strpbrk{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strpbrk{{.*}} #2 size_t t17(char *x) { return strspn(x, ""); } // CHECK-LABEL: t17 -// CHECK: call{{.*}}@strspn{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strspn{{.*}} #2 double t18(char **x) { return strtod("123.4", x); } // CHECK-LABEL: t18 -// CHECK: call{{.*}}@strtod{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strtod{{.*}} #2 float t19(char **x) { return strtof("123.4", x); } // CHECK-LABEL: t19 -// CHECK: call{{.*}}@strtof{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strtof{{.*}} #2 long double t20(char **x) { return strtold("123.4", x); } // CHECK-LABEL: t20 -// CHECK: call{{.*}}@strtold{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strtold{{.*}} #2 long int t21(char **x) { return strtol("1234", x, 10); } // CHECK-LABEL: t21 -// CHECK: call{{.*}}@strtol{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strtol{{.*}} #2 long int t22(char **x) { return strtoll("1234", x, 10); } // CHECK-LABEL: t22 -// CHECK: call{{.*}}@strtoll{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strtoll{{.*}} #2 long int t23(char **x) { return strtoul("1234", x, 10); } // CHECK-LABEL: t23 -// CHECK: call{{.*}}@strtoul{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strtoul{{.*}} #2 long int t24(char **x) { return strtoull("1234", x, 10); } // CHECK-LABEL: t24 -// CHECK: call{{.*}}@strtoull{{.*}} [[ATTR]] +// CHECK: call{{.*}}@strtoull{{.*}} #2 void t25(FILE *fp, int *buf) { size_t x = fwrite(buf, sizeof(int), 10, fp); size_t y = fread(buf, sizeof(int), 10, fp); } // CHECK-LABEL: t25 -// CHECK: call{{.*}}@fwrite{{.*}} [[ATTR]] -// CHECK: call{{.*}}@fread{{.*}} [[ATTR]] +// CHECK: call{{.*}}@fwrite{{.*}} #2 +// CHECK: call{{.*}}@fread{{.*}} #2 FILE *t26(const char *path, const char *mode) { return fopen(path, mode); } // CHECK-LABEL: t26 -// CHECK: call{{.*}}@fopen{{.*}} [[ATTR]] +// CHECK: call{{.*}}@fopen{{.*}} #2 -// CHECK: [[ATTR]] = { nobuiltin } +// GLOBAL: #2 = { nobuiltin "no-builtins" } +// INDIVIDUAL: #2 = { nobuiltin "no-builtin-ceil" "no-builtin-copysign" "no-builtin-cos" "no-builtin-fabs" "no-builtin-floor" "no-builtin-fopen" "no-builtin-fread" "no-builtin-fwrite" "no-builtin-stpcpy" "no-builtin-strcat" "no-builtin-strchr" "no-builtin-strcmp" "no-builtin-strcpy" "no-builtin-strlen" "no-builtin-strncat" "no-builtin-strncmp" "no-builtin-strncpy" "no-builtin-strpbrk" "no-builtin-strrchr" "no-builtin-strspn" "no-builtin-strtod" "no-builtin-strtof" "no-builtin-strtol" "no-builtin-strtold" "no-builtin-strtoll" "no-builtin-strtoul" "no-builtin-strtoull" } Index: clang/lib/CodeGen/CGCall.cpp =================================================================== --- clang/lib/CodeGen/CGCall.cpp +++ clang/lib/CodeGen/CGCall.cpp @@ -1876,17 +1876,22 @@ if (Fn->isNoReturn()) FuncAttrs.addAttribute(llvm::Attribute::NoReturn); - if (const auto *NBA = TargetDecl->getAttr<NoBuiltinAttr>()) { - bool HasWildcard = llvm::is_contained(NBA->builtinNames(), "*"); - if (HasWildcard) - FuncAttrs.addAttribute("no-builtins"); - else - for (StringRef BuiltinName : NBA->builtinNames()) { - SmallString<32> AttributeName; - AttributeName += "no-builtin-"; - AttributeName += BuiltinName; - FuncAttrs.addAttribute(AttributeName); - } + const auto *NBA = Fn->getAttr<NoBuiltinAttr>(); + bool HasWildcard = NBA && llvm::is_contained(NBA->builtinNames(), "*"); + if (getLangOpts().NoBuiltin || HasWildcard) + FuncAttrs.addAttribute("no-builtins"); + else { + const auto AddNoBuiltinAttr = [&FuncAttrs](StringRef BuiltinName) { + SmallString<32> AttributeName; + AttributeName += "no-builtin-"; + AttributeName += BuiltinName; + FuncAttrs.addAttribute(AttributeName); + }; + for (StringRef BuiltinName : getLangOpts().NoBuiltinFuncs) + AddNoBuiltinAttr(BuiltinName); + if (NBA) + for (StringRef BuiltinName : NBA->builtinNames()) + AddNoBuiltinAttr(BuiltinName); } } }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits