2004-09-22 Martin Baulig <martin@ximian.com>

	Thanks to Peter Sestoft for this bug report.

	* expression.cs (Conditional): If both the `trueExpr' and the
	`falseExpr' is a NullLiteral, return a NullLiteral.

svn path=/trunk/mcs/; revision=34237

diff --git a/mcs/gmcs/ChangeLog b/mcs/gmcs/ChangeLog
index a284b383f359624d04fa1dde023d812ff81ae5ae..ec2a6fc0b4ac0fdd99d8e9da8dd0fbc054192072 100755 (executable)
--- a/mcs/gmcs/ChangeLog
+++ b/mcs/gmcs/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-22  Martin Baulig  <martin@ximian.com>
+
+       Thanks to Peter Sestoft for this bug report.
+
+       * expression.cs (Conditional): If both the `trueExpr' and the
+       `falseExpr' is a NullLiteral, return a NullLiteral.
+
 2004-09-22  Martin Baulig  <martin@ximian.com>
 
        * statement.cs (Foreach.EmitCollectionForeach): If we're in an

diff --git a/mcs/gmcs/expression.cs b/mcs/gmcs/expression.cs
index 24dbb49389cdbb7122f7ef541d0e2aa569b89960..d7f95a5da8325910b8c013210b85a6aad0f53db9 100755 (executable)
--- a/mcs/gmcs/expression.cs
+++ b/mcs/gmcs/expression.cs
@@ -3484,6 +3484,9 @@ namespace Mono.CSharp {
                        if (trueExpr == null || falseExpr == null)
                                return null;
 
+                       if ((trueExpr is NullLiteral) && (falseExpr is NullLiteral))
+                               return trueExpr;
+
                        eclass = ExprClass.Value;
                        if (trueExpr.Type == falseExpr.Type)
                                type = trueExpr.Type;

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 056c20624af4b8951260506247bca3f2c97237fd..fa11e8e6e19735f62fc941d2b5bd6224faee5e1d 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-22  Martin Baulig  <martin@ximian.com>
+
+       Thanks to Peter Sestoft for this bug report.
+
+       * expression.cs (Conditional): If both the `trueExpr' and the
+       `falseExpr' is a NullLiteral, return a NullLiteral.
+
 2004-09-22  Martin Baulig  <martin@ximian.com>
 
        * statement.cs (Foreach.EmitCollectionForeach): If we're in an

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index f895e702afe2a99bbeba79cd25df61ef8ae935fd..eb2d1f14447e34b73b213927c8a24087051e1073 100755 (executable)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -3462,6 +3462,9 @@ namespace Mono.CSharp {
                        if (trueExpr == null || falseExpr == null)
                                return null;
 
+                       if ((trueExpr is NullLiteral) && (falseExpr is NullLiteral))
+                               return trueExpr;
+
                        eclass = ExprClass.Value;
                        if (trueExpr.Type == falseExpr.Type)
                                type = trueExpr.Type;