[mcs] Fixes flow analysis of if statement with constant expression

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index b14430ec912d239fd36d03eea6ecc8733e89c379..91b71ef1074557e627c386f136879c1d209341cf 100644 (file)
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -278,6 +278,10 @@ namespace Mono.CSharp {
                        var res = TrueStatement.FlowAnalysis (fc);
 
                        if (FalseStatement == null) {
+                               var c = expr as Constant;
+                               if (c != null && !c.IsDefaultValue)
+                                       return true_returns;
+
                                if (true_returns)
                                        fc.DefiniteAssignment = da_false;
                                else

diff --git a/mcs/tests/test-901.cs b/mcs/tests/test-901.cs
new file mode 100644 (file)
index 0000000..bdd7d07
--- /dev/null
+++ b/mcs/tests/test-901.cs
@@ -0,0 +1,23 @@
+using System;
+
+class X
+{
+       public static void Main ()
+       {
+               int i;
+               if (true) {
+                       i = 3;
+               }
+
+               Console.WriteLine (i);
+
+               int i2;
+               if (false) {
+                       throw new ApplicationException ();
+               } else {
+                       i2 = 4;
+               }
+
+               Console.WriteLine (i2);
+       }
+}
\ No newline at end of file