2002-07-11 Miguel de Icaza <miguel@ximian.com>

	* statement.cs (Unsafe.Resolve): The state is checked during
	resolve, not emit, so we have to set the flags for IsUnsfe here.

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

diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
index 79a13da51812c823002e98b6c98ff3f1f84a1e65..1b2bd473e33aa83d45356898fbfce1da765ecc85 100755 (executable)
--- a/mcs/mcs/ChangeLog
+++ b/mcs/mcs/ChangeLog
@@ -1,3 +1,8 @@
+2002-07-11  Miguel de Icaza  <miguel@ximian.com>
+
+       * statement.cs (Unsafe.Resolve): The state is checked during
+       resolve, not emit, so we have to set the flags for IsUnsfe here.
+
 2002-07-10  Miguel de Icaza  <miguel@ximian.com>
 
        * expression.cs (MemberAccess.ResolveMemberAccess): Since we can

diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
index cd2ed4aa47b69a8fd593d091a41f423eac7cc215..2a2c44bbcb1b9438c9565305d27604567fd21524 100755 (executable)
--- a/mcs/mcs/statement.cs
+++ b/mcs/mcs/statement.cs
@@ -2186,21 +2186,21 @@ namespace Mono.CSharp {
                }
 
                public override bool Resolve (EmitContext ec)
-               {
-                       return Block.Resolve (ec);
-               }
-               
-               public override bool Emit (EmitContext ec)
                {
                        bool previous_state = ec.InUnsafe;
                        bool val;
                        
                        ec.InUnsafe = true;
-                       val = Block.Emit (ec);
+                       val = Block.Resolve (ec);
                        ec.InUnsafe = previous_state;
 
                        return val;
                }
+               
+               public override bool Emit (EmitContext ec)
+               {
+                       return Block.Emit (ec);
+               }
        }
 
        //