Merge pull request #14 from fourst4r/patch-2

Fix NullTypeEnforcer simplifying dynamic null comparisons
SomeRanDev · Feb 9, 2024 · 6f0ad9f · 6f0ad9f
2 parents dd4c848 + 08b3d18
commit 6f0ad9f
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/reflaxe/compiler/NullTypeEnforcer.hx b/src/reflaxe/compiler/NullTypeEnforcer.hx
@@ -128,11 +128,11 @@ class NullTypeEnforcer {
 				if(e1.isNullExpr() && e2.isNullExpr()) {
 					expr.expr = TConst(TBool(true));
 				} else if(e1.isNullExpr()) {
-					if(!e2.t.isNull()) {
+					if(!e2.t.isNull() && !e2.t.isDynamic()) {
 						expr.expr = TConst(TBool(false));
 					}
 				} else if(e2.isNullExpr()) {
-					if(!e1.t.isNull()) {
+					if(!e1.t.isNull() && !e1.t.isDynamic()) {
 						expr.expr = TConst(TBool(false));
 					}
 				}
@@ -141,11 +141,11 @@ class NullTypeEnforcer {
 				if(e1.isNullExpr() && e2.isNullExpr()) {
 					expr.expr = TConst(TBool(false));
 				} else if(e1.isNullExpr()) {
-					if(!e2.t.isNull()) {
+					if(!e2.t.isNull() && !e2.t.isDynamic()) {
 						expr.expr = TConst(TBool(true));
 					}
 				} else if(e2.isNullExpr()) {
-					if(!e1.t.isNull()) {
+					if(!e1.t.isNull() && !e1.t.isDynamic()) {
 						expr.expr = TConst(TBool(true));
 					}
 				}