commit 37fa9d65eaa7d8fae7e5b787c4e8ef0a982cead5
author Akira Hatanaka <ahatanaka@apple.com> Tue Mar 10 22:01:45 2020 -0700
committer Akira Hatanaka <ahatanaka@apple.com> Tue Mar 10 22:10:32 2020 -0700
tree 36a90f06dacd5e2d6e506359382708c77c047ac2
parent 14a1b80e044aac1947c891525cf30521be0a79b7

[CodeGen][ObjC] Don't extend lifetime of ObjC pointers passed to calls
to __builtin_os_log_format if ARC isn't enabled

Fixes a bug introduced in this commit:
https://github.com/llvm/llvm-project/commit/f4d791f8332c2bb7e89849d0fe4ef48cb0a23229

rdar://problem/60301219

clang/lib/CodeGen/CGBuiltin.cpp

diff --git a/clang/lib/CodeGen/CGBuiltin.cpp b/clang/lib/CodeGen/CGBuiltin.cpp
index 090efaa..e2cd0f88 100644
--- a/clang/lib/CodeGen/CGBuiltin.cpp
+++ b/clang/lib/CodeGen/CGBuiltin.cpp
@@ -1325,7 +1325,8 @@
       // enclosing block scope.
       // FIXME: We only have to do this if the argument is a temporary, which
       //        gets released after the full expression.
-      if (TheExpr->getType()->isObjCRetainableType()) {
+      if (TheExpr->getType()->isObjCRetainableType() &&
+          getLangOpts().ObjCAutoRefCount) {
         assert(getEvaluationKind(TheExpr->getType()) == TEK_Scalar &&
                "Only scalar can be a ObjC retainable type");
         if (!isa<Constant>(ArgVal)) {