[cfe-commits] r80720 - in /cfe/trunk: lib/CodeGen/CGExprScalar.cpp lib/Sema/SemaCXXCast.cpp test/CodeGenCXX/PR4827-cast.cpp
Anders Carlsson
andersca at mac.com
Tue Sep 1 13:52:42 PDT 2009
Author: andersca
Date: Tue Sep 1 15:52:42 2009
New Revision: 80720
URL: http://llvm.org/viewvc/llvm-project?rev=80720&view=rev
Log:
Use the correct cast kinds for bit casts and function to pointer decay. Fixes PR4827.
Added:
cfe/trunk/test/CodeGenCXX/PR4827-cast.cpp
Modified:
cfe/trunk/lib/CodeGen/CGExprScalar.cpp
cfe/trunk/lib/Sema/SemaCXXCast.cpp
Modified: cfe/trunk/lib/CodeGen/CGExprScalar.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CGExprScalar.cpp?rev=80720&r1=80719&r2=80720&view=diff
==============================================================================
--- cfe/trunk/lib/CodeGen/CGExprScalar.cpp (original)
+++ cfe/trunk/lib/CodeGen/CGExprScalar.cpp Tue Sep 1 15:52:42 2009
@@ -627,6 +627,10 @@
switch (Kind) {
default:
break;
+ case CastExpr::CK_BitCast: {
+ Value *Src = Visit(const_cast<Expr*>(E));
+ return Builder.CreateBitCast(Src, ConvertType(DestTy));
+ }
case CastExpr::CK_ArrayToPointerDecay: {
assert(E->getType()->isArrayType() &&
"Array to pointer decay must have array source type!");
Modified: cfe/trunk/lib/Sema/SemaCXXCast.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaCXXCast.cpp?rev=80720&r1=80719&r2=80720&view=diff
==============================================================================
--- cfe/trunk/lib/Sema/SemaCXXCast.cpp (original)
+++ cfe/trunk/lib/Sema/SemaCXXCast.cpp Tue Sep 1 15:52:42 2009
@@ -89,13 +89,15 @@
CXXMethodDecl *&ConversionDecl);
static TryCastResult TryStaticCast(Sema &Self, Expr *SrcExpr,
QualType DestType, bool CStyle,
+ CastExpr::CastKind &Kind,
const SourceRange &OpRange,
- CastExpr::CastKind &Kind, unsigned &msg,
+ unsigned &msg,
CXXMethodDecl *&ConversionDecl);
static TryCastResult TryConstCast(Sema &Self, Expr *SrcExpr, QualType DestType,
bool CStyle, unsigned &msg);
static TryCastResult TryReinterpretCast(Sema &Self, Expr *SrcExpr,
QualType DestType, bool CStyle,
+ CastExpr::CastKind &Kind,
const SourceRange &OpRange,
unsigned &msg);
@@ -347,8 +349,10 @@
if (!DestType->isLValueReferenceType())
Self.DefaultFunctionArrayConversion(SrcExpr);
+ CastExpr::CastKind Kind = CastExpr::CK_Unknown;
unsigned msg = diag::err_bad_cxx_cast_generic;
- if (TryReinterpretCast(Self, SrcExpr, DestType, /*CStyle*/false, OpRange, msg)
+ if (TryReinterpretCast(Self, SrcExpr, DestType, /*CStyle*/false, Kind,
+ OpRange, msg)
!= TC_Success && msg != 0)
Self.Diag(OpRange.getBegin(), msg) << CT_Reinterpret
<< SrcExpr->getType() << DestType << OpRange;
@@ -374,9 +378,8 @@
unsigned msg = diag::err_bad_cxx_cast_generic;
CXXMethodDecl *ConversionDecl = 0;
- if (TryStaticCast(Self, SrcExpr, DestType, /*CStyle*/false, OpRange,
- Kind, msg,
- ConversionDecl)
+ if (TryStaticCast(Self, SrcExpr, DestType, /*CStyle*/false, Kind,
+ OpRange, msg, ConversionDecl)
!= TC_Success && msg != 0)
Self.Diag(OpRange.getBegin(), msg) << CT_Static
<< SrcExpr->getType() << DestType << OpRange;
@@ -387,8 +390,8 @@
/// and casting away constness.
static TryCastResult TryStaticCast(Sema &Self, Expr *SrcExpr,
QualType DestType, bool CStyle,
- const SourceRange &OpRange,
- CastExpr::CastKind &Kind, unsigned &msg,
+ CastExpr::CastKind &Kind,
+ const SourceRange &OpRange, unsigned &msg,
CXXMethodDecl *&ConversionDecl)
{
// The order the tests is not entirely arbitrary. There is one conversion
@@ -864,6 +867,7 @@
static TryCastResult TryReinterpretCast(Sema &Self, Expr *SrcExpr,
QualType DestType, bool CStyle,
+ CastExpr::CastKind &Kind,
const SourceRange &OpRange,
unsigned &msg) {
QualType OrigDestType = DestType, OrigSrcType = SrcExpr->getType();
@@ -1014,6 +1018,7 @@
// Void pointers are not specified, but supported by every compiler out there.
// So we finish by allowing everything that remains - it's got to be two
// object pointers.
+ Kind = CastExpr::CK_BitCast;
return TC_Success;
}
@@ -1046,14 +1051,16 @@
// even if a cast resulting from that interpretation is ill-formed.
// In plain language, this means trying a const_cast ...
unsigned msg = diag::err_bad_cxx_cast_generic;
- TryCastResult tcr = TryConstCast(*this, CastExpr, CastTy, /*CStyle*/true,msg);
+ TryCastResult tcr = TryConstCast(*this, CastExpr, CastTy, /*CStyle*/true,
+ msg);
if (tcr == TC_NotApplicable) {
// ... or if that is not possible, a static_cast, ignoring const, ...
- tcr = TryStaticCast(*this, CastExpr, CastTy, /*CStyle*/true, R, Kind, msg,
+ tcr = TryStaticCast(*this, CastExpr, CastTy, /*CStyle*/true, Kind, R, msg,
ConversionDecl);
if (tcr == TC_NotApplicable) {
// ... and finally a reinterpret_cast, ignoring const.
- tcr = TryReinterpretCast(*this, CastExpr, CastTy, /*CStyle*/true, R, msg);
+ tcr = TryReinterpretCast(*this, CastExpr, CastTy, /*CStyle*/true, Kind,
+ R, msg);
}
}
Added: cfe/trunk/test/CodeGenCXX/PR4827-cast.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/PR4827-cast.cpp?rev=80720&view=auto
==============================================================================
--- cfe/trunk/test/CodeGenCXX/PR4827-cast.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/PR4827-cast.cpp Tue Sep 1 15:52:42 2009
@@ -0,0 +1,5 @@
+// RUN: clang-cc -emit-llvm -o - %s
+struct A;
+struct B;
+extern A *f();
+void a() { (B *) f(); }
More information about the cfe-commits
mailing list