Author: vedantk Date: Tue Apr 2 10:42:38 2019 New Revision: 357501 URL: http://llvm.org/viewvc/llvm-project?rev=357501&view=rev Log: [os_log] Mark os_log_helper `nounwind`
Allow the optimizer to remove unnecessary EH cleanups surrounding calls to os_log_helper, to save some code size. As a follow-up, it might be worthwhile to add a BasicNoexcept exception spec to os_log_helper, and to then teach CGCall to emit direct calls for callees which can't throw. This could save some compile-time. Differential Revision: https://reviews.llvm.org/D60108 Added: cfe/trunk/test/CodeGenObjCXX/os_log.mm Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp Modified: cfe/trunk/lib/CodeGen/CGBuiltin.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGBuiltin.cpp?rev=357501&r1=357500&r2=357501&view=diff ============================================================================== --- cfe/trunk/lib/CodeGen/CGBuiltin.cpp (original) +++ cfe/trunk/lib/CodeGen/CGBuiltin.cpp Tue Apr 2 10:42:38 2019 @@ -1138,6 +1138,7 @@ llvm::Function *CodeGenFunction::generat 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) Added: cfe/trunk/test/CodeGenObjCXX/os_log.mm URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenObjCXX/os_log.mm?rev=357501&view=auto ============================================================================== --- cfe/trunk/test/CodeGenObjCXX/os_log.mm (added) +++ cfe/trunk/test/CodeGenObjCXX/os_log.mm Tue Apr 2 10:42:38 2019 @@ -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 _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
