src/expression.d

@@ -13936,11 +13936,15 @@ public:
 
     override Expression semantic(Scope* sc)
     {
+        if (type)
+            return this;
+
         // same as for AndAnd
         e1 = e1.semantic(sc);
         e1 = resolveProperties(sc, e1);
         e1 = e1.toBoolean(sc);
         uint cs1 = sc.callSuper;
+
         if (sc.flags & SCOPEcondition)
         {
             /* If in static if, don't evaluate e2 if we don't have to.
@@ -13951,9 +13955,11 @@ public:
                 return new IntegerExp(loc, 1, Type.tbool);
             }
         }
+
         e2 = e2.semantic(sc);
         sc.mergeCallSuper(loc, cs1);
         e2 = resolveProperties(sc, e2);
+
         if (e2.type.ty == Tvoid)
             type = Type.tvoid;
         else
@@ -13970,6 +13976,7 @@ public:
             return e1;
         if (e2.op == TOKerror)
             return e2;
+
         return this;
     }
 
@@ -13997,11 +14004,15 @@ public:
 
     override Expression semantic(Scope* sc)
     {
+        if (type)
+            return this;
+
         // same as for OrOr
         e1 = e1.semantic(sc);
         e1 = resolveProperties(sc, e1);
         e1 = e1.toBoolean(sc);
         uint cs1 = sc.callSuper;
+
         if (sc.flags & SCOPEcondition)
         {
             /* If in static if, don't evaluate e2 if we don't have to.
@@ -14012,9 +14023,11 @@ public:
                 return new IntegerExp(loc, 0, Type.tbool);
             }
         }
+
         e2 = e2.semantic(sc);
         sc.mergeCallSuper(loc, cs1);
         e2 = resolveProperties(sc, e2);
+
         if (e2.type.ty == Tvoid)
             type = Type.tvoid;
         else
@@ -14031,6 +14044,7 @@ public:
             return e1;
         if (e2.op == TOKerror)
             return e2;
+
         return this;
     }
 

test/runnable/xtest46.d

@@ -7694,6 +7694,25 @@ void test15141()
     assert(b is null); // OK <- oops
 }
 
+/***************************************************/
+// 15366
+
+enum E15366 : bool { A, B };
+
+struct S15366
+{
+    void func1(E15366 e) {}
+
+    void func2(E15366 a, E15366 b)
+    {
+        func1(cast(E15366)(a && b));
+        func1(cast(E15366)(a || b));
+
+        auto x1 = cast(E15366)(a && b);
+        auto x2 = cast(E15366)(a || b);
+    }
+}
+
 /***************************************************/
 
 int main()