From 5b1f3f0b21f1ad6999b0ae9f3fa3259737c799e5 Mon Sep 17 00:00:00 2001 From: Anders Carlsson Date: Wed, 10 Dec 2008 23:30:05 +0000 Subject: [PATCH] Make sure to promote expressions of the form (floating point + complex integer) correctly, to (complex floating point + complex floating point) git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60862 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaExpr.cpp | 12 ++++++++++-- test/Sema/complex-promotion.c | 11 +++++++++++ 2 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 test/Sema/complex-promotion.c diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index 3870f0736e..b254254241 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -189,14 +189,22 @@ QualType Sema::UsualArithmeticConversionsType(QualType lhs, QualType rhs) { // Now handle "real" floating types (i.e. float, double, long double). if (lhs->isRealFloatingType() || rhs->isRealFloatingType()) { // if we have an integer operand, the result is the real floating type. - if (rhs->isIntegerType() || rhs->isComplexIntegerType()) { + if (rhs->isIntegerType()) { // convert rhs to the lhs floating point type. return lhs; } - if (lhs->isIntegerType() || lhs->isComplexIntegerType()) { + if (rhs->isComplexIntegerType()) { + // convert rhs to the complex floating point type. + return Context.getComplexType(lhs); + } + if (lhs->isIntegerType()) { // convert lhs to the rhs floating point type. return rhs; } + if (lhs->isComplexIntegerType()) { + // convert lhs to the complex floating point type. + return Context.getComplexType(rhs); + } // We have two real floating types, float/complex combos were handled above. // Convert the smaller operand to the bigger result. int result = Context.getFloatingTypeOrder(lhs, rhs); diff --git a/test/Sema/complex-promotion.c b/test/Sema/complex-promotion.c new file mode 100644 index 0000000000..a9b557d221 --- /dev/null +++ b/test/Sema/complex-promotion.c @@ -0,0 +1,11 @@ +// RUN: clang %s -verify -fsyntax-only + +float a; + +int b[__builtin_classify_type(a + 1i) == 9 ? 1 : -1]; +int c[__builtin_classify_type(1i + a) == 9 ? 1 : -1]; + +double d; +__typeof__ (d + 1i) e; + +int f[sizeof(e) == 2 * sizeof(double) ? 1 : -1]; -- 2.40.0