diff --git a/lib/CodeGen/CodeGenModule.cpp b/lib/CodeGen/CodeGenModule.cpp
index b03513a..a0024aa 100644
--- a/lib/CodeGen/CodeGenModule.cpp
+++ b/lib/CodeGen/CodeGenModule.cpp
@@ -824,7 +824,9 @@
   if (!Entry)
     Entry = EmitForwardFunctionDefinition(D, 0);
 
-  return llvm::ConstantExpr::getBitCast(Entry, PTy);
+  if (Entry->getType() != PTy)
+    return llvm::ConstantExpr::getBitCast(Entry, PTy);
+  return Entry;
 }
 
 void CodeGenModule::EmitGlobalFunctionDefinition(const FunctionDecl *D) {
@@ -954,8 +956,11 @@
 
   llvm::GlobalValue *&ExistingFn =
     GlobalDeclMap[getContext().Idents.get(Name).getName()];
-  if (ExistingFn)
+  if (ExistingFn) {
+    if (ExistingFn->getType() == Ty)
+      return FunctionSlot = ExistingFn;
     return FunctionSlot = llvm::ConstantExpr::getBitCast(ExistingFn, Ty);
+  }
 
   // FIXME: param attributes for sext/zext etc.
   return FunctionSlot = ExistingFn =