2004-04-27 Martin Baulig <martin@ximian.com>

	* flowanalysis.cs (FlowBranching.UsageVector.MergeChild): If we're
	a finite loop block, also do the ALWAYS->SOMETIMES for throws (not
	just for returns).

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 048c987a4a491e79fe47cd4d1338c84de7d01c0e..50900038a31a6afdf043e0286d42d3229476ddf3 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-27  Martin Baulig  <martin@ximian.com>
+
+       * flowanalysis.cs (FlowBranching.UsageVector.MergeChild): If we're
+       a finite loop block, also do the ALWAYS->SOMETIMES for throws (not
+       just for returns).
+
 2004-04-27  Martin Baulig  <martin@ximian.com>
 
        * statement.cs (Block.AddLabel): Also check for implicit blocks

diff --git a/mcs/mcs/flowanalysis.cs b/mcs/mcs/flowanalysis.cs
index 901d13b5a02f48a0cecb91f2b3f4172b7ba33075..0a951b4ebf5adc933020440e96898feecd5d5104 100644 (file)
--- a/mcs/mcs/flowanalysis.cs
+++ b/mcs/mcs/flowanalysis.cs
@@ -329,6 +329,12 @@ namespace Mono.CSharp
                                update ();
                        }
 
+                       public void SetThrowsSometimes ()
+                       {
+                               throws = FlowReturns.Sometimes;
+                               update ();
+                       }
+
                        public void SetBarrier ()
                        {
                                barrier = FlowReturns.Always;
@@ -637,6 +643,10 @@ namespace Mono.CSharp
                                                        // We're either finite or we may leave the loop.
                                                        new_r.SetReturnsSometimes ();
                                                }
+                                               if (new_r.Throws == FlowReturns.Always) {
+                                                       // We're either finite or we may leave the loop.
+                                                       new_r.SetThrowsSometimes ();
+                                               }
                                        }
                                } else if (branching.Type == BranchingType.Switch)
                                        new_r.ResetBreaks ();