diff options
| author | Anders Carlsson <andersca@mac.com> | 2009-10-18 18:12:03 +0000 |
|---|---|---|
| committer | Anders Carlsson <andersca@mac.com> | 2009-10-18 18:12:03 +0000 |
| commit | 094c459525d08a9c08ed5119808d549660a7025c (patch) | |
| tree | 21e77440721ccef56c86c8775769e861f3c09236 /clang/lib/CodeGen | |
| parent | ad9c37661bb0dc8660b05ba65ee94777d7a51fdb (diff) | |
| download | bcm5719-llvm-094c459525d08a9c08ed5119808d549660a7025c.tar.gz bcm5719-llvm-094c459525d08a9c08ed5119808d549660a7025c.zip | |
Add some more cast kinds.
llvm-svn: 84423
Diffstat (limited to 'clang/lib/CodeGen')
| -rw-r--r-- | clang/lib/CodeGen/CGExprScalar.cpp | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/clang/lib/CodeGen/CGExprScalar.cpp b/clang/lib/CodeGen/CGExprScalar.cpp index 422e2b65bca..d986549555c 100644 --- a/clang/lib/CodeGen/CGExprScalar.cpp +++ b/clang/lib/CodeGen/CGExprScalar.cpp @@ -700,7 +700,16 @@ Value *ScalarExprEmitter::EmitCastExpr(const CastExpr *CE) { case CastExpr::CK_IntegralToPointer: { Value *Src = Visit(const_cast<Expr*>(E)); - return Builder.CreateIntToPtr(Src, ConvertType(DestTy)); + + // First, convert to the correct width so that we control the kind of + // extension. + const llvm::Type *MiddleTy = + llvm::IntegerType::get(VMContext, CGF.LLVMPointerWidth); + bool InputSigned = E->getType()->isSignedIntegerType(); + llvm::Value* IntResult = + Builder.CreateIntCast(Src, MiddleTy, InputSigned, "conv"); + + return Builder.CreateIntToPtr(IntResult, ConvertType(DestTy)); } case CastExpr::CK_PointerToIntegral: { |
