commit 936240c77a0967e3c764ad495278a909fe02f175
author Akira Hatanaka <ahatanaka@apple.com> Tue Aug 14 00:15:42 2018 +0000
committer Akira Hatanaka <ahatanaka@apple.com> Tue Aug 14 00:15:42 2018 +0000
tree d078e9c8f8dd66ef1dcf7904f401921bb869f5c3
parent e67e3c804594a70411637cdaf6c34bd6c5aa414f

[CodeGen] Before returning a copy/dispose helper function, bitcast it to
a void pointer type.

This fixes a bug introduced in r339438.

llvm-svn: 339633

clang/lib/CodeGen/CGBlocks.cpp

diff --git a/clang/lib/CodeGen/CGBlocks.cpp b/clang/lib/CodeGen/CGBlocks.cpp
index 573c077..c5066f4 100644
--- a/clang/lib/CodeGen/CGBlocks.cpp
+++ b/clang/lib/CodeGen/CGBlocks.cpp
@@ -1816,7 +1816,7 @@
                                    /*IsCopyHelper*/ true, CGM);
 
   if (llvm::GlobalValue *Func = CGM.getModule().getNamedValue(FuncName))
-    return Func;
+    return llvm::ConstantExpr::getBitCast(Func, VoidPtrTy);
 
   ASTContext &C = getContext();
 
@@ -2010,7 +2010,7 @@
                                    /*IsCopyHelper*/ false, CGM);
 
   if (llvm::GlobalValue *Func = CGM.getModule().getNamedValue(FuncName))
-    return Func;
+    return llvm::ConstantExpr::getBitCast(Func, VoidPtrTy);
 
   ASTContext &C = getContext();