[llvm-branch-commits] [cfe-branch] r124384 - in /cfe/branches/Apple/sill-IB: llvm-merge-list.txt src/tools/clang/ src/tools/clang/include/clang/Sema/Sema.h src/tools/clang/lib/Sema/SemaCXXCast.cpp src/tools/clang/lib/Sema/SemaExprCXX.cpp src/tools/clang/lib/Sema/SemaInit.cpp src/tools/clang/lib/Sema/SemaOverload.cpp src/tools/clang/lib/Sema/SemaTemplate.cpp src/tools/clang/test/CXX/expr/expr.cast/p4.cpp
Douglas Gregor
dgregor at apple.com
Thu Jan 27 10:38:35 PST 2011
Author: dgregor
Date: Thu Jan 27 12:38:35 2011
New Revision: 124384
URL: http://llvm.org/viewvc/llvm-project?rev=124384&view=rev
Log:
Merge r124340, fix for <rdar://problem/8913298>
Added:
cfe/branches/Apple/sill-IB/src/tools/clang/test/CXX/expr/expr.cast/p4.cpp
- copied unchanged from r124340, cfe/trunk/test/CXX/expr/expr.cast/p4.cpp
Modified:
cfe/branches/Apple/sill-IB/llvm-merge-list.txt
cfe/branches/Apple/sill-IB/src/tools/clang/ (props changed)
cfe/branches/Apple/sill-IB/src/tools/clang/include/clang/Sema/Sema.h
cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaCXXCast.cpp
cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp
cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaInit.cpp
cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaOverload.cpp
cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaTemplate.cpp
Modified: cfe/branches/Apple/sill-IB/llvm-merge-list.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/llvm-merge-list.txt?rev=124384&r1=124383&r2=124384&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/llvm-merge-list.txt (original)
+++ cfe/branches/Apple/sill-IB/llvm-merge-list.txt Thu Jan 27 12:38:35 2011
@@ -186,3 +186,7 @@
# <rdar://problem/8795958> clang crash
122104
+
+# <rdar://problem/8913298> Upcasts which discard qualifiers are treated as bitcasts
+124340
+
Propchange: cfe/branches/Apple/sill-IB/src/tools/clang/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Thu Jan 27 12:38:35 2011
@@ -0,0 +1,2 @@
+/cfe/trunk:124340
+/llvm/branches/Apple/Pertwee/tools/clang:110850,110961
Modified: cfe/branches/Apple/sill-IB/src/tools/clang/include/clang/Sema/Sema.h
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/src/tools/clang/include/clang/Sema/Sema.h?rev=124384&r1=124383&r2=124384&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/src/tools/clang/include/clang/Sema/Sema.h (original)
+++ cfe/branches/Apple/sill-IB/src/tools/clang/include/clang/Sema/Sema.h Thu Jan 27 12:38:35 2011
@@ -976,7 +976,8 @@
Expr *From,
bool SuppressUserConversions,
bool AllowExplicit,
- bool InOverloadResolution);
+ bool InOverloadResolution,
+ bool CStyle);
bool IsIntegralPromotion(Expr *From, QualType FromType, QualType ToType);
bool IsFloatingPointPromotion(QualType FromType, QualType ToType);
@@ -1000,7 +1001,8 @@
CastKind &Kind,
CXXCastPath &BasePath,
bool IgnoreBaseAccess);
- bool IsQualificationConversion(QualType FromType, QualType ToType);
+ bool IsQualificationConversion(QualType FromType, QualType ToType,
+ bool CStyle);
bool DiagnoseMultipleUserDefinedConversion(Expr *From, QualType ToType);
@@ -4150,10 +4152,11 @@
bool PerformImplicitConversion(Expr *&From, QualType ToType,
const ImplicitConversionSequence& ICS,
AssignmentAction Action,
- bool IgnoreBaseAccess = false);
+ bool CStyle = false);
bool PerformImplicitConversion(Expr *&From, QualType ToType,
const StandardConversionSequence& SCS,
- AssignmentAction Action,bool IgnoreBaseAccess);
+ AssignmentAction Action,
+ bool CStyle);
/// the following "Check" methods will return a valid/converted QualType
/// or a null QualType (indicating an error diagnostic was issued).
Modified: cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaCXXCast.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaCXXCast.cpp?rev=124384&r1=124383&r2=124384&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaCXXCast.cpp (original)
+++ cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaCXXCast.cpp Thu Jan 27 12:38:35 2011
@@ -303,7 +303,7 @@
// Test if they're compatible.
return SrcConstruct != DestConstruct &&
- !Self.IsQualificationConversion(SrcConstruct, DestConstruct);
+ !Self.IsQualificationConversion(SrcConstruct, DestConstruct, false);
}
/// CheckDynamicCast - Check that a dynamic_cast\<DestType\>(SrcExpr) is valid.
@@ -991,8 +991,7 @@
InitializedEntity Entity = InitializedEntity::InitializeTemporary(DestType);
InitializationKind InitKind
- = InitializationKind::CreateCast(/*FIXME:*/OpRange,
- CStyle);
+ = InitializationKind::CreateCast(/*FIXME:*/OpRange, CStyle);
InitializationSequence InitSeq(Self, Entity, InitKind, &SrcExpr, 1);
// At this point of CheckStaticCast, if the destination is a reference,
Modified: cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp?rev=124384&r1=124383&r2=124384&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp (original)
+++ cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaExprCXX.cpp Thu Jan 27 12:38:35 2011
@@ -1697,11 +1697,11 @@
bool
Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
const ImplicitConversionSequence &ICS,
- AssignmentAction Action, bool IgnoreBaseAccess) {
+ AssignmentAction Action, bool CStyle) {
switch (ICS.getKind()) {
case ImplicitConversionSequence::StandardConversion:
if (PerformImplicitConversion(From, ToType, ICS.Standard, Action,
- IgnoreBaseAccess))
+ CStyle))
return true;
break;
@@ -1734,7 +1734,7 @@
if (!ICS.UserDefined.EllipsisConversion) {
if (PerformImplicitConversion(From, BeforeToType,
ICS.UserDefined.Before, AA_Converting,
- IgnoreBaseAccess))
+ CStyle))
return true;
}
@@ -1751,7 +1751,7 @@
From = CastArg.takeAs<Expr>();
return PerformImplicitConversion(From, ToType, ICS.UserDefined.After,
- AA_Converting, IgnoreBaseAccess);
+ AA_Converting, CStyle);
}
case ImplicitConversionSequence::AmbiguousConversion:
@@ -1781,7 +1781,7 @@
bool
Sema::PerformImplicitConversion(Expr *&From, QualType ToType,
const StandardConversionSequence& SCS,
- AssignmentAction Action, bool IgnoreBaseAccess) {
+ AssignmentAction Action, bool CStyle) {
// Overall FIXME: we are recomputing too many types here and doing far too
// much extra work. What this means is that we need to keep track of more
// information that is computed when we try the implicit conversion initially,
@@ -1920,7 +1920,7 @@
CastKind Kind = CK_Unknown;
CXXCastPath BasePath;
- if (CheckPointerConversion(From, ToType, Kind, BasePath, IgnoreBaseAccess))
+ if (CheckPointerConversion(From, ToType, Kind, BasePath, CStyle))
return true;
ImpCastExprToType(From, ToType, Kind, VK_RValue, &BasePath);
break;
@@ -1929,8 +1929,7 @@
case ICK_Pointer_Member: {
CastKind Kind = CK_Unknown;
CXXCastPath BasePath;
- if (CheckMemberPointerConversion(From, ToType, Kind, BasePath,
- IgnoreBaseAccess))
+ if (CheckMemberPointerConversion(From, ToType, Kind, BasePath, CStyle))
return true;
if (CheckExceptionSpecCompatibility(From, ToType))
return true;
@@ -1953,7 +1952,7 @@
From->getLocStart(),
From->getSourceRange(),
&BasePath,
- IgnoreBaseAccess))
+ CStyle))
return true;
ImpCastExprToType(From, ToType.getNonReferenceType(),
Modified: cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaInit.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaInit.cpp?rev=124384&r1=124383&r2=124384&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaInit.cpp (original)
+++ cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaInit.cpp Thu Jan 27 12:38:35 2011
@@ -2547,7 +2547,9 @@
bool T1Function = T1->isFunctionType();
if (isLValueRef || T1Function) {
if (InitCategory.isLValue() &&
- RefRelationship >= Sema::Ref_Compatible_With_Added_Qualification) {
+ (RefRelationship >= Sema::Ref_Compatible_With_Added_Qualification ||
+ (Kind.isCStyleOrFunctionalCast() &&
+ RefRelationship == Sema::Ref_Related))) {
// - is an lvalue (but is not a bit-field), and "cv1 T1" is
// reference-compatible with "cv2 T2," or
//
@@ -2628,7 +2630,9 @@
// - the initializer expression is an rvalue and "cv1 T1" is
// reference-compatible with "cv2 T2", or
if (InitCategory.isRValue() &&
- RefRelationship >= Sema::Ref_Compatible_With_Added_Qualification) {
+ (RefRelationship >= Sema::Ref_Compatible_With_Added_Qualification ||
+ Kind.isCStyleOrFunctionalCast() &&
+ RefRelationship == Sema::Ref_Related)) {
// The corresponding bullet in C++03 [dcl.init.ref]p5 gives the
// compiler the freedom to perform a copy here or bind to the
// object, while C++0x requires that we bind directly to the
@@ -2698,7 +2702,8 @@
if (S.TryImplicitConversion(Sequence, TempEntity, Initializer,
/*SuppressUserConversions*/ false,
AllowExplicit,
- /*FIXME:InOverloadResolution=*/false)) {
+ /*FIXME:InOverloadResolution=*/false,
+ /*CStyle=*/Kind.isCStyleOrFunctionalCast())) {
// FIXME: Use the conversion function set stored in ICS to turn
// this into an overloading ambiguity diagnostic. However, we need
// to keep that set as an OverloadCandidateSet rather than as some
@@ -3204,7 +3209,8 @@
if (S.TryImplicitConversion(*this, Entity, Initializer,
/*SuppressUserConversions*/ true,
/*AllowExplicitConversions*/ false,
- /*InOverloadResolution*/ false))
+ /*InOverloadResolution*/ false,
+ /*CStyle=*/Kind.isCStyleOrFunctionalCast()))
{
if (Initializer->getType() == Context.OverloadTy )
SetFailed(InitializationSequence::FK_AddressOfOverloadFailed);
@@ -3859,11 +3865,9 @@
}
case SK_ConversionSequence: {
- bool IgnoreBaseAccess = Kind.isCStyleOrFunctionalCast();
-
if (S.PerformImplicitConversion(CurInitExpr, Step->Type, *Step->ICS,
getAssignmentAction(Entity),
- IgnoreBaseAccess))
+ Kind.isCStyleOrFunctionalCast()))
return ExprError();
CurInit.release();
Modified: cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaOverload.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaOverload.cpp?rev=124384&r1=124383&r2=124384&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaOverload.cpp (original)
+++ cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaOverload.cpp Thu Jan 27 12:38:35 2011
@@ -35,7 +35,8 @@
static bool IsStandardConversion(Sema &S, Expr* From, QualType ToType,
bool InOverloadResolution,
- StandardConversionSequence &SCS);
+ StandardConversionSequence &SCS,
+ bool CStyle);
static OverloadingResult
IsUserDefinedConversion(Sema &S, Expr *From, QualType ToType,
UserDefinedConversionSequence& User,
@@ -712,10 +713,11 @@
TryImplicitConversion(Sema &S, Expr *From, QualType ToType,
bool SuppressUserConversions,
bool AllowExplicit,
- bool InOverloadResolution) {
+ bool InOverloadResolution,
+ bool CStyle) {
ImplicitConversionSequence ICS;
if (IsStandardConversion(S, From, ToType, InOverloadResolution,
- ICS.Standard)) {
+ ICS.Standard, CStyle)) {
ICS.setStandard();
return ICS;
}
@@ -826,12 +828,14 @@
Expr *Initializer,
bool SuppressUserConversions,
bool AllowExplicitConversions,
- bool InOverloadResolution) {
+ bool InOverloadResolution,
+ bool CStyle) {
ImplicitConversionSequence ICS
= clang::TryImplicitConversion(*this, Initializer, Entity.getType(),
SuppressUserConversions,
AllowExplicitConversions,
- InOverloadResolution);
+ InOverloadResolution,
+ CStyle);
if (ICS.isBad()) return true;
// Perform the actual conversion.
@@ -859,7 +863,8 @@
ICS = clang::TryImplicitConversion(*this, From, ToType,
/*SuppressUserConversions=*/false,
AllowExplicit,
- /*InOverloadResolution=*/false);
+ /*InOverloadResolution=*/false,
+ /*CStyle=*/false);
return PerformImplicitConversion(From, ToType, ICS, Action);
}
@@ -936,7 +941,8 @@
/// routine will return false and the value of SCS is unspecified.
static bool IsStandardConversion(Sema &S, Expr* From, QualType ToType,
bool InOverloadResolution,
- StandardConversionSequence &SCS) {
+ StandardConversionSequence &SCS,
+ bool CStyle) {
QualType FromType = From->getType();
// Standard conversions (C++ [conv])
@@ -1126,7 +1132,7 @@
QualType CanonFrom;
QualType CanonTo;
// The third conversion can be a qualification conversion (C++ 4p1).
- if (S.IsQualificationConversion(FromType, ToType)) {
+ if (S.IsQualificationConversion(FromType, ToType, CStyle)) {
SCS.Third = ICK_Qualification;
FromType = ToType;
CanonFrom = S.Context.getCanonicalType(FromType);
@@ -1909,7 +1915,8 @@
/// an rvalue of type FromType to ToType is a qualification conversion
/// (C++ 4.4).
bool
-Sema::IsQualificationConversion(QualType FromType, QualType ToType) {
+Sema::IsQualificationConversion(QualType FromType, QualType ToType,
+ bool CStyle) {
FromType = Context.getCanonicalType(FromType);
ToType = Context.getCanonicalType(ToType);
@@ -1934,12 +1941,12 @@
// -- for every j > 0, if const is in cv 1,j then const is in cv
// 2,j, and similarly for volatile.
- if (!ToType.isAtLeastAsQualifiedAs(FromType))
+ if (!CStyle && !ToType.isAtLeastAsQualifiedAs(FromType))
return false;
// -- if the cv 1,j and cv 2,j are different, then const is in
// every cv for 0 < k < j.
- if (FromType.getCVRQualifiers() != ToType.getCVRQualifiers()
+ if (!CStyle && FromType.getCVRQualifiers() != ToType.getCVRQualifiers()
&& !PreviousToQualsIncludeConst)
return false;
@@ -3053,7 +3060,8 @@
// and does not constitute a conversion.
ICS = TryImplicitConversion(S, Init, T1, SuppressUserConversions,
/*AllowExplicit=*/false,
- /*InOverloadResolution=*/false);
+ /*InOverloadResolution=*/false,
+ /*CStyle=*/false);
// Of course, that's still a reference binding.
if (ICS.isStandard()) {
@@ -3085,7 +3093,8 @@
return TryImplicitConversion(S, From, ToType,
SuppressUserConversions,
/*AllowExplicit=*/false,
- InOverloadResolution);
+ InOverloadResolution,
+ /*CStyle=*/false);
}
/// TryObjectArgumentInitialization - Try to initialize the object
@@ -3223,7 +3232,8 @@
// FIXME: Are these flags correct?
/*SuppressUserConversions=*/false,
/*AllowExplicit=*/true,
- /*InOverloadResolution=*/false);
+ /*InOverloadResolution=*/false,
+ /*CStyle=*/false);
}
/// PerformContextuallyConvertToBool - Perform a contextual conversion
@@ -3249,7 +3259,8 @@
// FIXME: Are these flags correct?
/*SuppressUserConversions=*/false,
/*AllowExplicit=*/true,
- /*InOverloadResolution=*/false);
+ /*InOverloadResolution=*/false,
+ /*CStyle=*/false);
}
/// PerformContextuallyConvertToObjCId - Perform a contextual conversion
Modified: cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaTemplate.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaTemplate.cpp?rev=124384&r1=124383&r2=124384&view=diff
==============================================================================
--- cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/branches/Apple/sill-IB/src/tools/clang/lib/Sema/SemaTemplate.cpp Thu Jan 27 12:38:35 2011
@@ -2882,7 +2882,7 @@
if (ParamType->isPointerType() &&
!ParamType->getAs<PointerType>()->getPointeeType()->isFunctionType() &&
- S.IsQualificationConversion(ArgType, ParamType)) {
+ S.IsQualificationConversion(ArgType, ParamType, false)) {
// For pointer-to-object types, qualification conversions are
// permitted.
} else {
@@ -3223,7 +3223,8 @@
ParamType,
Arg, Converted);
- if (IsQualificationConversion(ArgType, ParamType.getNonReferenceType())) {
+ if (IsQualificationConversion(ArgType, ParamType.getNonReferenceType(),
+ false)) {
ImpCastExprToType(Arg, ParamType, CK_NoOp, CastCategory(Arg));
} else if (!Context.hasSameUnqualifiedType(ArgType,
ParamType.getNonReferenceType())) {
@@ -3286,7 +3287,7 @@
if (Context.hasSameUnqualifiedType(ParamType, ArgType)) {
// Types match exactly: nothing more to do here.
- } else if (IsQualificationConversion(ArgType, ParamType)) {
+ } else if (IsQualificationConversion(ArgType, ParamType, false)) {
ImpCastExprToType(Arg, ParamType, CK_NoOp, CastCategory(Arg));
} else {
// We can't perform this conversion.
@@ -3382,7 +3383,7 @@
// the element type on the parameter could be more qualified than the
// element type in the expression we constructed.
if (IsQualificationConversion(((Expr*) RefExpr.get())->getType(),
- ParamType.getUnqualifiedType())) {
+ ParamType.getUnqualifiedType(), false)) {
Expr *RefE = RefExpr.takeAs<Expr>();
ImpCastExprToType(RefE, ParamType.getUnqualifiedType(), CK_NoOp);
RefExpr = Owned(RefE);
More information about the llvm-branch-commits
mailing list