[659970] Close anonymous method scope also for top-level blocks

diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
index 06f6ceccf07c0f57ec41951855dce37f4044f386..6a9e1929176e1a8a4986a19798e5fb98fe262f97 100644 (file)
--- a/mcs/mcs/cs-parser.jay
+++ b/mcs/mcs/cs-parser.jay
@@ -6250,6 +6250,7 @@ void start_block (Location loc)
 {
        if (current_block == null) {
                current_block = new ToplevelBlock (compiler, current_local_parameters, loc);
+               parsing_anonymous_method = false;
        } else if (parsing_anonymous_method) {
                current_block = new ParametersBlock (current_block, current_local_parameters, loc);
                parsing_anonymous_method = false;

diff --git a/mcs/tests/test-anon-83.cs b/mcs/tests/test-anon-83.cs
new file mode 100644 (file)
index 0000000..879c2c8
--- /dev/null
+++ b/mcs/tests/test-anon-83.cs
@@ -0,0 +1,20 @@
+using System;
+
+public class C
+{
+       public event EventHandler MyDelegate = delegate { };
+
+       internal void DoSomething (bool bValue)
+       {
+               if (!bValue) {
+                       // It has to be here to check we are closing correctly top-block
+                       return;
+               }
+       }
+       
+       public static void Main ()
+       {
+       }
+}
+
+