commit e77cc39afff8b9bedbd5a3be6fdbeef5e786184f
author Tim Northover <tnorthover@apple.com> Sat Mar 29 13:28:05 2014 +0000
committer Tim Northover <tnorthover@apple.com> Sat Mar 29 13:28:05 2014 +0000
tree ea8fcd7c22a75c9434eb859d3d093f6a4247ea9a
parent e8fba987355caf92749e25a9f50b4f1ed1006fcf

ObjC: allow targets to decide when to use stret for blocks.

This was originally part of the ARM64 patch, but seems semantically
separate.

llvm-svn: 205097

clang/lib/CodeGen/CGBlocks.cpp

diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp
index ce2a193..15b08d4 100644
--- a/clang/lib/CodeGen/CGBlocks.cpp
+++ b/clang/lib/CodeGen/CGBlocks.cpp
@@ -1121,7 +1121,7 @@
   const CGFunctionInfo &fnInfo = CGM.getTypes().arrangeFreeFunctionDeclaration(
       fnType->getReturnType(), args, fnType->getExtInfo(),
       fnType->isVariadic());
-  if (CGM.ReturnTypeUsesSRet(fnInfo))
+  if (CGM.ReturnSlotInterferesWithArgs(fnInfo))
     blockInfo.UsesStret = true;
 
   llvm::FunctionType *fnLLVMType = CGM.getTypes().GetFunctionType(fnInfo);