[os_log] Mark os_log_helper `nounwind`

[vsk]

Summary

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.

[JDevlieghere]

LGTM

[ahatanak]

test/CodeGenObjCXX/os_log.mm

3

Sorry for the late feedback.

Can we pass -O0 instead of -O1 to avoid running the optimization passes and just check that the helper function has attribute nounwind? I haven't checked, but I suspect there are already tests in llvm that check SimplifyCFG turns nounwind invokes to calls.

I'm cleaning up this file and os_log.m in preparation for adding more test cases.

[vsk]

test/CodeGenObjCXX/os_log.mm

3

Done in a66e1d2aa943959e158821be8956109cb5ef3b3b.

lib/CodeGen/CGBuiltin.cpp

llvm::Function *CodeGenFunction::generateBuiltinOSLogHelperFunction(
   const CGFunctionInfo &FI =
       CGM.getTypes().arrangeBuiltinFunctionDeclaration(ReturnTy, Args);
   llvm::FunctionType *FuncTy = CGM.getTypes().GetFunctionType(FI);
   llvm::Function *Fn = llvm::Function::Create(
       FuncTy, llvm::GlobalValue::LinkOnceODRLinkage, Name, &CGM.getModule());
   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)
     Fn->addFnAttr(llvm::Attribute::NoInline);
 
   auto NL = ApplyDebugLocation::CreateEmpty(*this);
   IdentifierInfo *II = &Ctx.Idents.get(Name);
   FunctionDecl *FD = FunctionDecl::Create(

test/CodeGenObjCXX/os_log.mm

+// 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