emit:

t.c:4:9: error: invalid type 'short *' to __real operator
                         __tg_choose (__real__(z), C##f(z), (C)(z), C##l(z)),
                                      ^
instead of:
t.c:4:9: error: invalid type 'short *' to __real or __imag operator
                         __tg_choose (__real__(z), C##f(z), (C)(z), C##l(z)),
                                      ^

fixing a fixme.  It would be even fancier to get the spelling of the token, but I
don't care *that* much :)

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64759 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/clang/Basic/DiagnosticSemaKinds.def b/include/clang/Basic/DiagnosticSemaKinds.def
index 5e311e74d07003bdc8f446bdbfbf48b122001e73..3f7ad9a5caac3a1f2a1c8f97cba1be94bcdb8e0b 100644 (file)
--- a/include/clang/Basic/DiagnosticSemaKinds.def
+++ b/include/clang/Basic/DiagnosticSemaKinds.def
@@ -813,9 +813,8 @@ DIAG(err_typecheck_pointer_arith_void_type, ERROR,
      "arithmetic on pointer to void type")
 DIAG(err_typecheck_decl_incomplete_type, ERROR,
      "variable has incomplete type %0")
-// FIXME: Use %select
 DIAG(err_realimag_invalid_type, ERROR,
-     "invalid type %0 to __real or __imag operator")
+     "invalid type %0 to %1 operator")
 DIAG(err_typecheck_sclass_fscope, ERROR,
      "illegal storage class on file-scoped variable")
 DIAG(err_typecheck_sclass_func, ERROR,

diff --git a/lib/Sema/Sema.h b/lib/Sema/Sema.h
index 067c7a57df48a87cb808fe2b67dd3ba57123597f..9b2b6e54d8cad4e7b7bea41bfafd1efb6b550a15 100644 (file)
--- a/lib/Sema/Sema.h
+++ b/lib/Sema/Sema.h
@@ -1868,7 +1868,7 @@ public:
                                           bool isInc);
   QualType CheckAddressOfOperand(Expr *op, SourceLocation OpLoc);
   QualType CheckIndirectionOperand(Expr *op, SourceLocation OpLoc);
-  QualType CheckRealImagOperand(Expr *&Op, SourceLocation OpLoc);
+  QualType CheckRealImagOperand(Expr *&Op, SourceLocation OpLoc, bool isReal);
   
   /// type checking primary expressions.
   QualType CheckExtVectorComponent(QualType baseType, SourceLocation OpLoc,

diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp
index ad4f297388ca799c1872cda3de1578a1bc2d627b..0a61fe40c37ced1f6b56f4d0ba859029aad2351e 100644 (file)
--- a/lib/Sema/SemaExpr.cpp
+++ b/lib/Sema/SemaExpr.cpp
@@ -1180,7 +1180,7 @@ Sema::ActOnSizeOfAlignOfExpr(SourceLocation OpLoc, bool isSizeof, bool isType,
                                                Range.getEnd()));
 }
 
-QualType Sema::CheckRealImagOperand(Expr *&V, SourceLocation Loc) {
+QualType Sema::CheckRealImagOperand(Expr *&V, SourceLocation Loc, bool isReal) {
   DefaultFunctionArrayConversion(V);
   
   // These operators return the element type of a complex type.
@@ -1192,7 +1192,8 @@ QualType Sema::CheckRealImagOperand(Expr *&V, SourceLocation Loc) {
     return V->getType();
   
   // Reject anything else.
-  Diag(Loc, diag::err_realimag_invalid_type) << V->getType();
+  Diag(Loc, diag::err_realimag_invalid_type) << V->getType()
+    << (isReal ? "__real" : "__imag");
   return QualType();
 }
 
@@ -4058,7 +4059,7 @@ Action::OwningExprResult Sema::ActOnUnaryOp(Scope *S, SourceLocation OpLoc,
     break;
   case UnaryOperator::Real:
   case UnaryOperator::Imag:
-    resultType = CheckRealImagOperand(Input, OpLoc);
+    resultType = CheckRealImagOperand(Input, OpLoc, Opc == UnaryOperator::Real);
     break;
   case UnaryOperator::Extension:
     resultType = Input->getType();