2004-12-22 Sebastien Pouliot <sebastien@ximian.com>

[mono.git] / mcs / mcs / expression.cs

diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
index 62544ca0f1ffe266adf706ee2cec958a7ef30227..e23aec28400a75423d15debf20216691bddeb8aa 100644 (file)
--- a/mcs/mcs/expression.cs
+++ b/mcs/mcs/expression.cs
@@ -2697,7 +2697,7 @@ namespace Mono.CSharp {
                                ((oper == Operator.LogicalAnd && (bool)lc.GetValue () == false) ||
                                 (oper == Operator.LogicalOr && (bool)lc.GetValue () == true))) {
 
-                               // TODO: make a sence to resolve unreachable expression as we do for statement
+                               // TODO: make a sense to resolve unreachable expression as we do for statement
                                Report.Warning (429, 4, loc, "Unreachable expression code detected");
                                return left;
                        }
@@ -3529,13 +3529,12 @@ namespace Mono.CSharp {
                                }
                        }
 
+                       // Dead code optimalization
                        if (expr is BoolConstant){
                                BoolConstant bc = (BoolConstant) expr;
 
-                               if (bc.Value)
-                                       return trueExpr;
-                               else
-                                       return falseExpr;
+                               Report.Warning (429, 4, bc.Value ? falseExpr.Location : trueExpr.Location, "Unreachable expression code detected");
+                               return bc.Value ? trueExpr : falseExpr;
                        }
 
                        return this;