when emitting pointer load from an lvalue or storing to an lvalue,
do an explicit bitcast to whatever ConvertType produces. This will
go with the next patch.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@134860 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 5d72162..c7a104e 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -756,6 +756,10 @@
return Builder.CreateTrunc(Value, Builder.getInt1Ty(), "tobool");
}
+ // If this is a pointer r-value, make sure that it has the right scalar type.
+ if (isa<llvm::PointerType>(Value->getType()))
+ return Builder.CreateBitCast(Value, ConvertType(Ty));
+
return Value;
}
@@ -764,6 +768,14 @@
QualType Ty,
llvm::MDNode *TBAAInfo) {
Value = EmitToMemory(Value, Ty);
+
+ if (isa<llvm::PointerType>(Value->getType())) {
+ llvm::Type *EltTy =
+ cast<llvm::PointerType>(Addr->getType())->getElementType();
+ if (EltTy != Value->getType())
+ Value = Builder.CreateBitCast(Value, EltTy);
+ }
+
llvm::StoreInst *Store = Builder.CreateStore(Value, Addr, Volatile);
if (Alignment)
Store->setAlignment(Alignment);