# HG changeset patch
# User Christian Kamm <kamm incasoftware de>
# Date 1227375493 -3600
# Node ID ef7fe998f9b396e0cc5ab0f8e7a16cf3288ef889
# Parent  4adf0f742896f9ce09a838f3321f7310c83501ec
Fix return type of OrOr and AndAndExp being set incorrectly if rhs is void. Thanks wilsonk!

diff -r 4adf0f742896 -r ef7fe998f9b3 dmd/expression.c
--- a/dmd/expression.c	Sat Nov 22 18:35:52 2008 +0100
+++ b/dmd/expression.c	Sat Nov 22 18:38:13 2008 +0100
@@ -8593,7 +8593,7 @@
     e2 = e2->checkToPointer();
 
     type = Type::tboolean;
-    if (e1->type->ty == Tvoid)
+    if (e2->type->ty == Tvoid)
 	type = Type::tvoid;
     if (e2->op == TOKtype || e2->op == TOKimport)
 	error("%s is not an expression", e2->toChars());
@@ -8658,7 +8658,7 @@
     e2 = e2->checkToPointer();
 
     type = Type::tboolean;
-    if (e1->type->ty == Tvoid)
+    if (e2->type->ty == Tvoid)
 	type = Type::tvoid;
     if (e2->op == TOKtype || e2->op == TOKimport)
 	error("%s is not an expression", e2->toChars());