Expand the definition of a complex promotion to include complex ->
complex conversions where the conversion between the real types is an
integral promotion. This is how G++ handles complex promotions for its
complex integer extension.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64344 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaOverload.cpp b/lib/Sema/SemaOverload.cpp
index 48d3105..c96fec7 100644
--- a/lib/Sema/SemaOverload.cpp
+++ b/lib/Sema/SemaOverload.cpp
@@ -738,7 +738,9 @@
// the bit-field is larger yet, no integral promotion applies to
// it. If the bit-field has an enumerated type, it is treated as any
// other value of that type for promotion purposes (C++ 4.5p3).
- if (MemberExpr *MemRef = dyn_cast<MemberExpr>(From)) {
+ // FIXME: We should delay checking of bit-fields until we actually
+ // perform the conversion.
+ if (MemberExpr *MemRef = dyn_cast_or_null<MemberExpr>(From)) {
using llvm::APSInt;
if (FieldDecl *MemberDecl = dyn_cast<FieldDecl>(MemRef->getMemberDecl())) {
APSInt BitWidth;
@@ -803,7 +805,7 @@
///
/// A complex promotion is defined as a complex -> complex conversion
/// where the conversion between the underlying real types is a
-/// floating-point conversion.
+/// floating-point or integral promotion.
bool Sema::IsComplexPromotion(QualType FromType, QualType ToType) {
const ComplexType *FromComplex = FromType->getAsComplexType();
if (!FromComplex)
@@ -814,7 +816,9 @@
return false;
return IsFloatingPointPromotion(FromComplex->getElementType(),
- ToComplex->getElementType());
+ ToComplex->getElementType()) ||
+ IsIntegralPromotion(0, FromComplex->getElementType(),
+ ToComplex->getElementType());
}
/// BuildSimilarlyQualifiedPointerType - In a pointer conversion from