diff options
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/CodeGen/CodeGenModule.cpp | 6 | ||||
| -rw-r--r-- | clang/test/CodeGen/attr-func-def.c | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp index 00121072dda..954fdab5679 100644 --- a/clang/lib/CodeGen/CodeGenModule.cpp +++ b/clang/lib/CodeGen/CodeGenModule.cpp @@ -827,10 +827,8 @@ void CodeGenModule::SetLLVMFunctionAttributesForDefinition(const Decl *D, F->addFnAttr(llvm::Attribute::NoInline); // OptimizeNone wins over OptimizeForSize, MinSize, AlwaysInline. - assert(!F->hasFnAttribute(llvm::Attribute::OptimizeForSize) && - "OptimizeNone and OptimizeForSize on same function!"); - assert(!F->hasFnAttribute(llvm::Attribute::MinSize) && - "OptimizeNone and MinSize on same function!"); + F->removeFnAttr(llvm::Attribute::OptimizeForSize); + F->removeFnAttr(llvm::Attribute::MinSize); assert(!F->hasFnAttribute(llvm::Attribute::AlwaysInline) && "OptimizeNone and AlwaysInline on same function!"); diff --git a/clang/test/CodeGen/attr-func-def.c b/clang/test/CodeGen/attr-func-def.c new file mode 100644 index 00000000000..ceafa1220f1 --- /dev/null +++ b/clang/test/CodeGen/attr-func-def.c @@ -0,0 +1,18 @@ +// RUN: %clang_cc1 -triple x86_64-apple-macosx10.10.0 -emit-llvm -Oz -o - %s | FileCheck %s + +// CHECK: define i32 @foo2(i32 %a) [[ATTRS2:#[0-9]+]] { +// CHECK: define i32 @foo1(i32 %a) [[ATTRS1:#[0-9]+]] { + +int foo1(int); + +int foo2(int a) { + return foo1(a + 2); +} + +__attribute__((optnone)) +int foo1(int a) { + return a + 1; +} + +// CHECK: attributes [[ATTRS2]] = { {{.*}}optsize{{.*}} } +// CHECK: attributes [[ATTRS1]] = { {{.*}}optnone{{.*}} } |
