maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

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.

llvm-svn: 64344
This commit is contained in:
Douglas Gregor 2009-02-12 00:26:06 +00:00
parent 78ca74d81d
commit 6752502b81
2 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
clang/lib/Sema/SemaOverload.cpp
View File

@ -738,7 +738,9 @@ bool Sema::IsIntegralPromotion(Expr *From, QualType FromType, QualType ToType)
// 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 @@ bool Sema::IsFloatingPointPromotion(QualType FromType, QualType ToType)
///
/// 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 @@ bool Sema::IsComplexPromotion(QualType FromType, QualType ToType) {
return false;
return IsFloatingPointPromotion(FromComplex->getElementType(),
ToComplex->getElementType());
ToComplex->getElementType()) ||
IsIntegralPromotion(0, FromComplex->getElementType(),
ToComplex->getElementType());
}
/// BuildSimilarlyQualifiedPointerType - In a pointer conversion from

9
clang/test/SemaCXX/complex-overload.cpp
View File

@ -38,6 +38,13 @@ void test_promote_or_convert(float f, float _Complex fc) {
char *promote_or_convert2(float);
int *promote_or_convert2(double _Complex);
void test_promote_or_convert(float _Complex fc) {
void test_promote_or_convert2(float _Complex fc) {
int *cp = promote_or_convert2(fc);
}
char *promote_or_convert3(int _Complex);
int *promote_or_convert3(long _Complex);
void test_promote_or_convert3(short _Complex sc) {
char *cp = promote_or_convert3(sc);
}