diff options
| -rw-r--r-- | clang/lib/CodeGen/CGBuiltin.cpp | 1 | ||||
| -rw-r--r-- | clang/test/CodeGenObjCXX/os_log.mm | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp index 72a336b104e..97789218bbe 100644 --- a/clang/lib/CodeGen/CGBuiltin.cpp +++ b/clang/lib/CodeGen/CGBuiltin.cpp @@ -1138,6 +1138,7 @@ llvm::Function *CodeGenFunction::generateBuiltinOSLogHelperFunction( Fn->setVisibility(llvm::GlobalValue::HiddenVisibility); CGM.SetLLVMFunctionAttributes(GlobalDecl(), FI, Fn); CGM.SetLLVMFunctionAttributesForDefinition(nullptr, Fn); + Fn->setDoesNotThrow(); // Attach 'noinline' at -Oz. if (CGM.getCodeGenOpts().OptimizeSize == 2) diff --git a/clang/test/CodeGenObjCXX/os_log.mm b/clang/test/CodeGenObjCXX/os_log.mm new file mode 100644 index 00000000000..78bc902f730 --- /dev/null +++ b/clang/test/CodeGenObjCXX/os_log.mm @@ -0,0 +1,19 @@ +// RUN: %clang_cc1 %s -emit-llvm -o - -triple x86_64-darwin-apple -fobjc-arc \ +// RUN: -fexceptions -fcxx-exceptions -O1 | FileCheck %s + +// Check that no EH cleanup is emitted around the call to __os_log_helper. +namespace no_eh_cleanup { + void release(int *lock); + + // CHECK-LABEL: define {{.*}} @_ZN13no_eh_cleanup3logERiPcS1_( + void log(int &i, char *data, char *buf) { + int lock __attribute__((cleanup(release))); + // CHECK: call void @__os_log_helper_1_2_2_4_0_8_34( + // CHECK-NEXT: call void @_ZN13no_eh_cleanup7releaseEPi + __builtin_os_log_format(buf, "%d %{public}s", i, data); + } + + // CHECK: define {{.*}} @__os_log_helper_1_2_2_4_0_8_34({{.*}} [[NUW:#[0-9]+]] +} + +// CHECK: attributes [[NUW]] = { {{.*}}nounwind |
