commit f8abb94c2c5b0f3bc8d2d5199fa21f93310f761f
author Daniel Dunbar <daniel@zuster.org> Sat Jan 24 19:08:01 2009 +0000
committer Daniel Dunbar <daniel@zuster.org> Sat Jan 24 19:08:01 2009 +0000
tree 97d9c1a31d5da57d24d08f6b1aeb19c904295a17
parent ff235da00701306ec70390c3ede586c93d63ef44

Fix invalid evaluation of _Complex float (real & imaginary parts had
mismatched semantics).
 - Enforce this in APValue.


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

include/clang/AST/APValue.h

diff --git a/include/clang/AST/APValue.h b/include/clang/AST/APValue.h
index d88757d..5d5abfe 100644
--- a/include/clang/AST/APValue.h
+++ b/include/clang/AST/APValue.h
@@ -188,11 +188,15 @@
       ((Vec*)(void*)Data)->Elts[i] = E[i];
   }
   void setComplexInt(const APSInt &R, const APSInt &I) {
+    assert(R.getBitWidth() == I.getBitWidth() && 
+           "Invalid complex int (type mismatch).");
     assert(isComplexInt() && "Invalid accessor");
     ((ComplexAPSInt*)(void*)Data)->Real = R;
     ((ComplexAPSInt*)(void*)Data)->Imag = I;
   }
   void setComplexFloat(const APFloat &R, const APFloat &I) {
+    assert(&R.getSemantics() == &I.getSemantics() && 
+           "Invalid complex float (type mismatch).");
     assert(isComplexFloat() && "Invalid accessor");
     ((ComplexAPFloat*)(void*)Data)->Real = R;
     ((ComplexAPFloat*)(void*)Data)->Imag = I;

lib/AST/ExprConstant.cpp

diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp
index f45bd78..16c6e89 100644
--- a/lib/AST/ExprConstant.cpp
+++ b/lib/AST/ExprConstant.cpp
@@ -1194,7 +1194,8 @@
     if (!EvaluateFloat(E->getSubExpr(), Result, Info))
       return APValue();
     
-    return APValue(APFloat(0.0), Result);
+    return APValue(APFloat(Result.getSemantics(), APFloat::fcZero), 
+                   Result);
   }
 
   APValue VisitCastExpr(CastExpr *E) {
@@ -1206,7 +1207,8 @@
       if (!EvaluateFloat(SubExpr, Result, Info))
         return APValue();
       
-      return APValue(Result, APFloat(0.0));
+      return APValue(Result, 
+                     APFloat(Result.getSemantics(), APFloat::fcZero));
     }
 
     // FIXME: Handle more casts.
@@ -1221,6 +1223,10 @@
 static bool EvaluateComplexFloat(const Expr *E, APValue &Result, EvalInfo &Info)
 {
   Result = ComplexFloatExprEvaluator(Info).Visit(const_cast<Expr*>(E));
+  if (Result.isComplexFloat())
+    assert(&Result.getComplexFloatReal().getSemantics() == 
+           &Result.getComplexFloatImag().getSemantics() && 
+           "Invalid complex evaluation.");
   return Result.isComplexFloat();
 }
 

test/Sema/const-eval.c

diff --git a/test/Sema/const-eval.c b/test/Sema/const-eval.c
index e3d63ca..71f7622 100644
--- a/test/Sema/const-eval.c
+++ b/test/Sema/const-eval.c
@@ -26,3 +26,6 @@
   int a;
   EVAL_EXPR(15, (_Bool)&a); // expected-error {{fields must have a constant size}}
 }
+
+// FIXME: Turn into EVAL_EXPR test once we have more folding.
+_Complex float g16 = (1.0f + 1.0fi);