Add VectorExp handling in CTFE interpreter to fix compilable/test8543.d

dlang · Dec 2, 2014 · ada7e9c · ada7e9c
1 parent 91e6e87
commit ada7e9c
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 1 deletion.
diff --git a/src/constfold.c b/src/constfold.c
@@ -1175,6 +1175,13 @@ UnionExp Cast(Type *type, Type *to, Expression *e1)
         return ue;
     }
 
+    if (e1->op == TOKvector && ((TypeVector *)e1->type)->basetype->equals(type) && type->equals(to))
+    {
+        Expression *ex = ((VectorExp *)e1)->e1;
+        memcpy(&ue, ex, ex->size);
+        return ue;
+    }
+
     if (e1->type->implicitConvTo(to) >= MATCHconst ||
         to->implicitConvTo(e1->type) >= MATCHconst)
     {

diff --git a/src/ctfeexpr.c b/src/ctfeexpr.c
@@ -446,6 +446,9 @@ Expression *resolveSlice(Expression *e)
  */
 uinteger_t resolveArrayLength(Expression *e)
 {
+    if (e->op == TOKvector)
+        e = ((VectorExp *)e)->e1;
+
     if (e->op == TOKnull)
         return 0;
     if (e->op == TOKslice)

diff --git a/src/interpret.c b/src/interpret.c
@@ -3787,6 +3787,8 @@ class Interpreter : public Visitor
         /* Assignment to variable of the form:
          *  v = newval
          */
+        if (e1->op == TOKvector)
+            e1 = ((VectorExp *)e1)->e1;
         if (e1->op == TOKvar)
         {
             VarExp *ve = (VarExp *)e1;
@@ -4009,6 +4011,7 @@ class Interpreter : public Visitor
                 return false;
             }
             if (oldval->op != TOKarrayliteral &&
+                oldval->op != TOKvector &&
                 oldval->op != TOKstring &&
                 oldval->op != TOKslice)
             {
@@ -4134,6 +4137,8 @@ class Interpreter : public Visitor
         }
         if (aggregate->op == TOKarrayliteral)
             existingAE = (ArrayLiteralExp *)aggregate;
+        else if (aggregate->op == TOKvector)
+            existingAE = (ArrayLiteralExp *)((VectorExp *)aggregate)->e1;
         else if (aggregate->op == TOKstring)
             existingSE = (StringExp *)aggregate;
         else
@@ -6172,7 +6177,7 @@ class Interpreter : public Visitor
             if (result->op == TOKstructliteral)
                 return;
             if ((e->type->ty == Tsarray || goal == ctfeNeedLvalue) && (
-                result->op == TOKarrayliteral ||
+                result->op == TOKarrayliteral || result->op == TOKvector ||
                 result->op == TOKassocarrayliteral || result->op == TOKstring ||
                 result->op == TOKclassreference || result->op == TOKslice))
             {