[msvc] Update csproj files (#5162)

[mono.git] / mcs / mcs / delegate.cs

diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs
index 4a0e4af6fc896df171530249f820649ebb8df0d5..368bb19c1b165d507f90e877ec40a5b993217093 100644 (file)
--- a/mcs/mcs/delegate.cs
+++ b/mcs/mcs/delegate.cs
@@ -101,9 +101,7 @@ namespace Mono.CSharp {
                public override void ApplyAttributeBuilder (Attribute a, MethodSpec ctor, byte[] cdata, PredefinedAttributes pa)
                {
                        if (a.Target == AttributeTargets.ReturnValue) {
-                               if (return_attributes == null)
-                                       return_attributes = new ReturnParameter (this, InvokeBuilder.MethodBuilder, Location);
-
+                               CreateReturnBuilder ();
                                return_attributes.ApplyAttributeBuilder (a, ctor, cdata, pa);
                                return;
                        }
@@ -122,6 +120,11 @@ namespace Mono.CSharp {
                        }
                }
 
+               ReturnParameter CreateReturnBuilder ()
+               {
+                       return return_attributes ?? (return_attributes = new ReturnParameter (this, InvokeBuilder.MethodBuilder, Location));
+               }
+
                protected override bool DoDefineMembers ()
                {
                        var builtin_types = Compiler.BuiltinTypes;
@@ -329,13 +332,16 @@ namespace Mono.CSharp {
                                }
                        }
 
-                       if (ReturnType.Type != null) {
-                               if (ReturnType.Type.BuiltinType == BuiltinTypeSpec.Type.Dynamic) {
-                                       return_attributes = new ReturnParameter (this, InvokeBuilder.MethodBuilder, Location);
-                                       Module.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder);
-                               } else if (ReturnType.Type.HasDynamicElement) {
-                                       return_attributes = new ReturnParameter (this, InvokeBuilder.MethodBuilder, Location);
-                                       Module.PredefinedAttributes.Dynamic.EmitAttribute (return_attributes.Builder, ReturnType.Type, Location);
+                       var rtype = ReturnType.Type;
+                       if (rtype != null) {
+                               if (rtype.BuiltinType == BuiltinTypeSpec.Type.Dynamic) {
+                                       Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder);
+                               } else if (rtype.HasDynamicElement) {
+                                       Module.PredefinedAttributes.Dynamic.EmitAttribute (CreateReturnBuilder ().Builder, rtype, Location);
+                               }
+
+                               if (rtype.HasNamedTupleElement) {
+                                       Module.PredefinedAttributes.TupleElementNames.EmitAttribute (CreateReturnBuilder ().Builder, rtype, Location);
                                }
 
                                ConstraintChecker.Check (this, ReturnType.Type, ReturnType.Location);