Merge pull request #347 from JamesB7/master
[mono.git] / mcs / mcs / argument.cs
index 30d98b3f2d7fceb278a940db5fea0a3d34ab0e3a..22e28eaf7290267fa3754ecd6666cbd1e2f15cad 100644 (file)
@@ -6,7 +6,8 @@
 //   Marek Safar (marek.safar@gmail.com)
 //
 // Dual licensed under the terms of the MIT X11 or GNU GPL
-// Copyright 2003-2008 Novell, Inc.
+// Copyright 2003-2011 Novell, Inc.
+// Copyright 2011 Xamarin Inc
 //
 
 using System;
@@ -103,6 +104,32 @@ namespace Mono.CSharp
                        return Expr.CreateExpressionTree (ec);
                }
 
+
+               public virtual void Emit (EmitContext ec)
+               {
+                       if (!IsByRef) {
+                               Expr.Emit (ec);
+                               return;
+                       }
+
+                       AddressOp mode = AddressOp.Store;
+                       if (ArgType == AType.Ref)
+                               mode |= AddressOp.Load;
+
+                       IMemoryLocation ml = (IMemoryLocation) Expr;
+                       ml.AddressOf (ec, mode);
+               }
+
+               public Argument EmitToField (EmitContext ec, bool cloneResult)
+               {
+                       var res = Expr.EmitToField (ec);
+                       if (cloneResult && res != Expr)
+                               return new Argument (res, ArgType);
+
+                       Expr = res;
+                       return this;
+               }
+
                public string GetSignatureForError ()
                {
                        if (Expr.eclass == ExprClass.MethodGroup)
@@ -141,21 +168,6 @@ namespace Mono.CSharp
                                        Expr = ErrorExpression.Instance;
 //                     }
                }
-
-               public virtual void Emit (EmitContext ec)
-               {
-                       if (!IsByRef) {
-                               Expr.Emit (ec);
-                               return;
-                       }
-
-                       AddressOp mode = AddressOp.Store;
-                       if (ArgType == AType.Ref)
-                               mode |= AddressOp.Load;
-
-                       IMemoryLocation ml = (IMemoryLocation) Expr;
-                       ml.AddressOf (ec, mode);
-               }
        }
 
        public class MovableArgument : Argument
@@ -182,7 +194,7 @@ namespace Mono.CSharp
                                variable.Release (ec);
                }
 
-               public void EmitAssign (EmitContext ec)
+               public void EmitToVariable (EmitContext ec)
                {
                        var type = Expr.Type;
                        if (IsByRef) {
@@ -246,13 +258,16 @@ namespace Mono.CSharp
                                ordered.Add (arg);
                        }
 
-                       public override Expression[] Emit (EmitContext ec, bool dup_args)
+                       public override Arguments Emit (EmitContext ec, bool dup_args, bool prepareAwait)
                        {
                                foreach (var a in ordered) {
-                                       a.EmitAssign (ec);
+                                       if (prepareAwait)
+                                               a.EmitToField (ec, false);
+                                       else
+                                               a.EmitToVariable (ec);
                                }
 
-                               return base.Emit (ec, dup_args);
+                               return base.Emit (ec, dup_args, prepareAwait);
                        }
                }
 
@@ -264,6 +279,11 @@ namespace Mono.CSharp
                        args = new List<Argument> (capacity);
                }
 
+               private Arguments (List<Argument> args)
+               {
+                       this.args = args;
+               }
+
                public void Add (Argument arg)
                {
                        args.Add (arg);
@@ -274,6 +294,16 @@ namespace Mono.CSharp
                        this.args.AddRange (args.args);
                }
 
+               public bool ContainsEmitWithAwait ()
+               {
+                       foreach (var arg in args) {
+                               if (arg.Expr.ContainsEmitWithAwait ())
+                                       return true;
+                       }
+
+                       return false;
+               }
+
                public ArrayInitializer CreateDynamicBinderArguments (ResolveContext rc)
                {
                        Location loc = Location.Null;
@@ -290,20 +320,20 @@ namespace Mono.CSharp
 
                                if (a.Expr is Constant) {
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "Constant", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "Constant", loc));
                                } else if (a.ArgType == Argument.AType.Ref) {
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsRef", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsRef", loc));
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc));
                                } else if (a.ArgType == Argument.AType.Out) {
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsOut", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsOut", loc));
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc));
                                } else if (a.ArgType == Argument.AType.DynamicTypeName) {
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsStaticType", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "IsStaticType", loc));
                                }
 
                                var arg_type = a.Expr.Type;
@@ -324,14 +354,14 @@ namespace Mono.CSharp
                                        }
 
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "UseCompileTimeType", loc));
                                }
 
                                string named_value;
                                NamedArgument na = a as NamedArgument;
                                if (na != null) {
                                        info_flags = new Binary (Binary.Operator.BitwiseOr, info_flags,
-                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "NamedArgument", loc), loc);
+                                               new MemberAccess (new MemberAccess (binder, info_flags_enum, loc), "NamedArgument", loc));
 
                                        named_value = na.Name;
                                } else {
@@ -395,46 +425,58 @@ namespace Mono.CSharp
                // 
                public void Emit (EmitContext ec)
                {
-                       Emit (ec, false);
+                       Emit (ec, false, false);
                }
 
                //
-               // if `dup_args' is true, a copy of the arguments will be left
-               // on the stack and return value will contain an array of access
-               // expressions
-               // NOTE: It's caller responsibility is to release temporary variables
+               // if `dup_args' is true or any of arguments contains await.
+               // A copy of all arguments will be returned to the caller
                //
-               public virtual Expression[] Emit (EmitContext ec, bool dup_args)
+               public virtual Arguments Emit (EmitContext ec, bool dup_args, bool prepareAwait)
                {
-                       Expression[] temps;
+                       List<Argument> dups;
 
-                       if (dup_args && Count != 0)
-                               temps = new Expression [Count];
+                       if ((dup_args && Count != 0) || prepareAwait)
+                               dups = new List<Argument> (Count);
                        else
-                               temps = null;
+                               dups = null;
 
-                       int i = 0;
                        LocalTemporary lt;
                        foreach (Argument a in args) {
+                               if (prepareAwait) {
+                                       dups.Add (a.EmitToField (ec, true));
+                                       continue;
+                               }
+                               
                                a.Emit (ec);
-                               if (!dup_args)
+
+                               if (!dup_args) {
                                        continue;
+                               }
 
-                               if (a.Expr is Constant || a.Expr is This) {
+                               if (a.Expr.IsSideEffectFree) {
                                        //
-                                       // No need to create a temporary variable for constants
+                                       // No need to create a temporary variable for side effect free expressions. I assume
+                                       // all side-effect free expressions are cheap, this has to be tweaked when we become
+                                       // more aggressive on detection
                                        //
-                                       temps[i] = a.Expr;
+                                       dups.Add (a);
                                } else {
                                        ec.Emit (OpCodes.Dup);
-                                       temps[i] = lt = new LocalTemporary (a.Type);
+
+                                       // TODO: Release local temporary on next Emit
+                                       // Need to add a flag to argument to indicate this
+                                       lt = new LocalTemporary (a.Type);
                                        lt.Store (ec);
-                               }
 
-                               ++i;
+                                       dups.Add (new Argument (lt, a.ArgType));
+                               }
                        }
 
-                       return temps;
+                       if (dups != null)
+                               return new Arguments (dups);
+
+                       return null;
                }
 
                public List<Argument>.Enumerator GetEnumerator ()
@@ -511,6 +553,12 @@ namespace Mono.CSharp
                                        if (la == a)
                                                break;
 
+                                       //
+                                       // When the argument is filled later by default expression
+                                       //
+                                       if (la == null)
+                                               continue;
+
                                        var ma = la as MovableArgument;
                                        if (ma == null) {
                                                ma = new MovableArgument (la);