Revert r232454 and r232456: "Fix the LLVM type used when lowering initializer list reference temporaries to global variables."

This caused PR22940.

llvm-svn: 232496

1 files changed, 2 insertions, 5 deletions

diff --git a/clang/lib/CodeGen/CGExpr.cpp b/clang/lib/CodeGen/CGExpr.cpp
index 92098752cb9..35275e58e93 100644
--- a/clang/lib/CodeGen/CGExpr.cpp
+++ b/clang/lib/CodeGen/CGExpr.cpp
@@ -316,16 +316,13 @@ createReferenceTemporary(CodeGenFunction &CGF,
         GV->setAlignment(
             CGF.getContext().getTypeAlignInChars(M->getType()).getQuantity());
         // FIXME: Should we put the new global into a COMDAT?
-        return llvm::ConstantExpr::getBitCast(
-            GV, CGF.ConvertTypeForMem(Inner->getType())->getPointerTo());
+        return GV;
       }
     return CGF.CreateMemTemp(Inner->getType(), "ref.tmp");
 
   case SD_Thread:
   case SD_Static:
-    return llvm::ConstantExpr::getBitCast(
-        CGF.CGM.GetAddrOfGlobalTemporary(M, Inner),
-        CGF.ConvertTypeForMem(Inner->getType())->getPointerTo());
+    return CGF.CGM.GetAddrOfGlobalTemporary(M, Inner);
 
   case SD_Dynamic:
     llvm_unreachable("temporary can't have dynamic storage duration");