@@ -5792,12 +5792,22 @@ public:
}
if (e->to->ty == Tsarray)
e1 = resolveSlice(e1);
- if (e->to->toBasetype()->ty == Tbool && e1->type->ty == Tpointer)
+ Type *tobt = e->to->toBasetype();
+ if (tobt->ty == Tbool && e1->type->ty == Tpointer)
{
new(pue) IntegerExp(e->loc, e1->op != TOKnull, e->to);
result = pue->exp();
return;
}
+ else if (tobt->isTypeBasic() && e1->op == TOKnull)
+ {
+ if (tobt->isintegral())
+ new(pue) IntegerExp(e->loc, 0, e->to);
+ else if (tobt->isreal())
+ new(pue) RealExp(e->loc, CTFloat::zero, e->to);
+ result = pue->exp();
+ return;
+ }
result = ctfeCast(pue, e->loc, e->type, e->to, e1);
}
new file mode 100644
@@ -0,0 +1,52 @@
+// https://issues.dlang.org/show_bug.cgi?id=21794
+/*
+TEST_OUTPUT:
+---
+0
+0u
+0L
+0LU
+0.0F
+0.0
+0.0L
+---
+*/
+
+bool fun(void* p) {
+ const x = cast(ulong)p;
+ return 1;
+}
+
+static assert(fun(null));
+
+T fun2(T)(void* p) {
+ const x = cast(T)p;
+ return x;
+}
+
+// These were an error before, they were returning a NullExp instead of IntegerExp/RealExp
+
+static assert(fun2!int(null) == 0);
+static assert(fun2!uint(null) == 0);
+static assert(fun2!long(null) == 0);
+static assert(fun2!ulong(null) == 0);
+static assert(fun2!float(null) == 0);
+static assert(fun2!double(null) == 0);
+static assert(fun2!real(null) == 0);
+
+// These were printing 'null' instead of the corresponding number
+
+const i = cast(int)null;
+const ui = cast(uint)null;
+const l = cast(long)null;
+const ul = cast(ulong)null;
+const f = cast(float)null;
+const d = cast(double)null;
+const r = cast(real)null;
+pragma(msg, i);
+pragma(msg, ui);
+pragma(msg, l);
+pragma(msg, ul);
+pragma(msg, f);
+pragma(msg, d);
+pragma(msg, r);