compiler/libec/pass15: Fix for using ^ (binary XOR) operator with enum values without...

diff --git a/compiler/bootstrap/libec/bootstrap/pass15.c b/compiler/bootstrap/libec/bootstrap/pass15.c
index d06a4b1..e402fe2 100644 (file)
--- a/compiler/bootstrap/libec/bootstrap/pass15.c
+++ b/compiler/bootstrap/libec/bootstrap/pass15.c
@@ -15831,7 +15831,7 @@ exp->__anon1.op.exp1->expType->refCount++;
 else
 {
 exp->__anon1.op.exp2->destType = exp->destType;
-if(!exp->__anon1.op.exp1 || exp->__anon1.op.op != '&')
+if(!exp->__anon1.op.exp1 || (exp->__anon1.op.op != '&' && exp->__anon1.op.op != '^'))
 exp->__anon1.op.exp2->opDestType = 1;
 if(exp->destType)
 exp->destType->refCount++;
@@ -15879,7 +15879,7 @@ else if(destClass && ((destClass->type == 3 && useDestType && useSideUnit) || (d
 if(exp->__anon1.op.exp2->destType)
 FreeType(exp->__anon1.op.exp2->destType);
 exp->__anon1.op.exp2->destType = exp->destType;
-if(exp->__anon1.op.op != '&')
+if(exp->__anon1.op.op != '&' && exp->__anon1.op.op != '^')
 exp->__anon1.op.exp2->opDestType = 1;
 if(exp->destType)
 exp->destType->refCount++;

diff --git a/compiler/libec/src/pass15.ec b/compiler/libec/src/pass15.ec
index f76f8c2..a9164fc 100644 (file)
--- a/compiler/libec/src/pass15.ec
+++ b/compiler/libec/src/pass15.ec
@@ -8371,7 +8371,7 @@ void ProcessExpressionType(Expression exp)
                else
                {
                   exp.op.exp2.destType = exp.destType;
-                  if(!exp.op.exp1 || exp.op.op != '&')
+                  if(!exp.op.exp1 || (exp.op.op != '&' && exp.op.op != '^'))
                      exp.op.exp2.opDestType = true;
                   if(exp.destType)
                      exp.destType.refCount++;
@@ -8420,7 +8420,7 @@ void ProcessExpressionType(Expression exp)
             {
                if(exp.op.exp2.destType) FreeType(exp.op.exp2.destType);
                exp.op.exp2.destType = exp.destType;
-               if(exp.op.op != '&')
+               if(exp.op.op != '&' && exp.op.op != '^')
                   exp.op.exp2.opDestType = true;
                if(exp.destType)
                   exp.destType.refCount++;