Merge pull request #23199 from cston/embedded

Merge misc. changes for embedded attributes from 7a0467ec

src/Compilers/CSharp/Portable/Compilation/CSharpCompilation.cs

@@ -1998,10 +1998,10 @@ private IEnumerable<Diagnostic> FreezeDeclarationDiagnostics()
         {
             _declarationDiagnosticsFrozen = true;
 
-            // Also freeze generated attribute flags by observing them
-            // symbols bound after getting the declaration diagnostics shouldn't need to modify the flags
-            _needsGeneratedIsReadOnlyAttribute_IsFrozen = true;
-            _needsGeneratedIsByRefLikeAttribute_IsFrozen = true;
+            // Also freeze generated attribute flags.
+            // Symbols bound after getting the declaration
+            // diagnostics shouldn't need to modify the flags.
+            _needsGeneratedAttributes_IsFrozen = true;
 
             var result = _lazyDeclarationDiagnostics?.AsEnumerable() ?? Enumerable.Empty<Diagnostic>();
             return result;

src/Compilers/CSharp/Portable/Emitter/Model/PEAssemblyBuilder.cs

 // Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 using System;
-using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Reflection;
-using System.Threading;
-using Microsoft.Cci;
 using Microsoft.CodeAnalysis.CSharp.Symbols;
 using Microsoft.CodeAnalysis.Emit;
 using Microsoft.CodeAnalysis.PooledObjects;
@@ -165,15 +162,11 @@ protected override void AddEmbeddedResourcesFromAddedModules(ArrayBuilder<Cci.Ma
 
         internal override SynthesizedAttributeData SynthesizeEmbeddedAttribute()
         {
-            if ((object)_lazyEmbeddedAttribute != null)
-            {
-                return new SynthesizedAttributeData(
-                    _lazyEmbeddedAttribute.Constructor,
-                    ImmutableArray<TypedConstant>.Empty,
-                    ImmutableArray<KeyValuePair<string, TypedConstant>>.Empty);
-            }
-
-            return base.SynthesizeEmbeddedAttribute();
+            // _lazyEmbeddedAttribute should have been created before calling this method.
+            return new SynthesizedAttributeData(
+                _lazyEmbeddedAttribute.Constructor,
+                ImmutableArray<TypedConstant>.Empty,
+                ImmutableArray<KeyValuePair<string, TypedConstant>>.Empty);
         }
 
         protected override SynthesizedAttributeData TrySynthesizeIsReadOnlyAttribute()

src/Compilers/CSharp/Portable/Emitter/Model/PEModuleBuilder.cs

@@ -43,7 +43,7 @@ public override NoPia.EmbeddedTypesManager EmbeddedTypesManagerOpt
 
         private bool _needsGeneratedIsReadOnlyAttribute_Value;
 
-        private bool _needsGeneratedIsReadOnlyAttribute_IsFrozen;
+        private bool _needsGeneratedAttributes_IsFrozen;
 
         /// <summary>
         /// Returns a value indicating whether this builder has a symbol that needs IsReadOnlyAttribute to be generated during emit phase.
@@ -54,7 +54,7 @@ internal bool NeedsGeneratedIsReadOnlyAttribute
         {
             get
             {
-                _needsGeneratedIsReadOnlyAttribute_IsFrozen = true;
+                _needsGeneratedAttributes_IsFrozen = true;
                 return Compilation.NeedsGeneratedIsReadOnlyAttribute || _needsGeneratedIsReadOnlyAttribute_Value;
             }
         }
@@ -1427,11 +1427,7 @@ protected override Cci.IMethodDefinition CreatePrivateImplementationDetailsStati
             return new SynthesizedPrivateImplementationDetailsStaticConstructor(SourceModule, details, GetUntranslatedSpecialType(SpecialType.System_Void, syntaxOpt, diagnostics));
         }
 
-        internal virtual SynthesizedAttributeData SynthesizeEmbeddedAttribute()
-        {
-            // Embedded attributes should never be synthesized in modules.
-            throw ExceptionUtilities.Unreachable;
-        }
+        internal abstract SynthesizedAttributeData SynthesizeEmbeddedAttribute();
 
         internal SynthesizedAttributeData SynthesizeIsReadOnlyAttribute(Symbol symbol)
         {
@@ -1469,6 +1465,8 @@ protected virtual SynthesizedAttributeData TrySynthesizeIsByRefLikeAttribute()
 
         internal void EnsureIsReadOnlyAttributeExists()
         {
+            Debug.Assert(!_needsGeneratedAttributes_IsFrozen);
+
             if (_needsGeneratedIsReadOnlyAttribute_Value || Compilation.NeedsGeneratedIsReadOnlyAttribute)
             {
                 return;
@@ -1477,7 +1475,6 @@ internal void EnsureIsReadOnlyAttributeExists()
             // Don't report any errors. They should be reported during binding.
             if (Compilation.CheckIfIsReadOnlyAttributeShouldBeEmbedded(diagnosticsOpt: null, locationOpt: null))
             {
-                Debug.Assert(!_needsGeneratedIsReadOnlyAttribute_IsFrozen);
                 _needsGeneratedIsReadOnlyAttribute_Value = true;
             }
         }

src/Compilers/CSharp/Portable/Emitter/Model/PENetModuleBuilder.cs

@@ -25,6 +25,12 @@ protected override void AddEmbeddedResourcesFromAddedModules(ArrayBuilder<Cci.Ma
             throw ExceptionUtilities.Unreachable;
         }
 
+        internal override SynthesizedAttributeData SynthesizeEmbeddedAttribute()
+        {
+            // Embedded attributes should never be synthesized in modules.
+            throw ExceptionUtilities.Unreachable;
+        }
+
         public override int CurrentGenerationOrdinal => 0;
         public override IEnumerable<Cci.IFileReference> GetFiles(EmitContext context) => SpecializedCollections.EmptyEnumerable<Cci.IFileReference>();
         public override ISourceAssemblySymbolInternal SourceAssemblyOpt => null;

src/Compilers/CSharp/Portable/Lowering/LocalRewriter/LocalRewriter.cs

@@ -3,6 +3,7 @@
 using System.Collections.Generic;
 using System.Collections.Immutable;
 using System.Diagnostics;
+using System.Linq;
 using Microsoft.CodeAnalysis.CodeGen;
 using Microsoft.CodeAnalysis.CSharp.Emit;
 using Microsoft.CodeAnalysis.CSharp.Symbols;
@@ -587,25 +588,8 @@ internal static bool WouldBeAssignableIfUsedAsMethodReceiver(BoundExpression rec
 
         private void CheckRefReadOnlySymbols(MethodSymbol symbol)
         {
-            var foundRefReadOnly = false;
-
-            if (symbol.ReturnsByRefReadonly)
-            {
-                foundRefReadOnly = true;
-            }
-            else
-            {
-                foreach (var parameter in symbol.Parameters)
-                {
-                    if (parameter.RefKind == RefKind.In)
-                    {
-                        foundRefReadOnly = true;
-                        break;
-                    }
-                }
-            }
-
-            if (foundRefReadOnly)
+            if (symbol.ReturnsByRefReadonly ||
+                symbol.Parameters.Any(p => p.RefKind == RefKind.In))
             {
                 _factory.CompilationState.ModuleBuilderOpt?.EnsureIsReadOnlyAttributeExists();
             }

src/Compilers/CSharp/Portable/Symbols/Compilation_WellKnownMembers.cs

@@ -35,8 +35,7 @@ public partial class CSharpCompilation
         private bool _needsGeneratedIsReadOnlyAttribute_Value;
         private bool _needsGeneratedIsByRefLikeAttribute_Value;
 
-        private bool _needsGeneratedIsReadOnlyAttribute_IsFrozen;
-        private bool _needsGeneratedIsByRefLikeAttribute_IsFrozen;
+        private bool _needsGeneratedAttributes_IsFrozen;
 
         /// <summary>
         /// Returns a value indicating whether this compilation has a member that needs IsReadOnlyAttribute to be generated during emit phase.
@@ -47,7 +46,7 @@ internal bool NeedsGeneratedIsReadOnlyAttribute
         {
             get
             {
-                _needsGeneratedIsReadOnlyAttribute_IsFrozen = true;
+                _needsGeneratedAttributes_IsFrozen = true;
                 return _needsGeneratedIsReadOnlyAttribute_Value;
             }
         }
@@ -61,7 +60,7 @@ internal bool NeedsGeneratedIsByRefLikeAttribute
         {
             get
             {
-                _needsGeneratedIsByRefLikeAttribute_IsFrozen = true;
+                _needsGeneratedAttributes_IsFrozen = true;
                 return _needsGeneratedIsByRefLikeAttribute_Value;
             }
         }
@@ -463,7 +462,7 @@ internal SynthesizedAttributeData SynthesizeDebuggerStepThroughAttribute()
 
         internal void EnsureIsReadOnlyAttributeExists(DiagnosticBag diagnostics, Location location, bool modifyCompilationForRefReadOnly)
         {
-            Debug.Assert(!modifyCompilationForRefReadOnly || !_needsGeneratedIsReadOnlyAttribute_IsFrozen);
+            Debug.Assert(!modifyCompilationForRefReadOnly || !_needsGeneratedAttributes_IsFrozen);
 
             var isNeeded = CheckIfIsReadOnlyAttributeShouldBeEmbedded(diagnostics, location);
 
@@ -475,7 +474,7 @@ internal void EnsureIsReadOnlyAttributeExists(DiagnosticBag diagnostics, Locatio
 
         internal void EnsureIsByRefLikeAttributeExists(DiagnosticBag diagnostics, Location location, bool modifyCompilationForIsByRefLike)
         {
-            Debug.Assert(!modifyCompilationForIsByRefLike || !_needsGeneratedIsByRefLikeAttribute_IsFrozen);
+            Debug.Assert(!modifyCompilationForIsByRefLike || !_needsGeneratedAttributes_IsFrozen);
 
             var isNeeded = CheckIfIsByRefLikeAttributeShouldBeEmbedded(diagnostics, location);
 

src/Compilers/CSharp/Portable/Symbols/Metadata/PE/PEMethodSymbol.cs

@@ -1121,6 +1121,16 @@ internal override OverriddenOrHiddenMembersResult OverriddenOrHiddenMembers
             }
         }
 
+        internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
+        {
+            throw ExceptionUtilities.Unreachable;
+        }
+
+        internal override void AddSynthesizedReturnTypeAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
+        {
+            throw ExceptionUtilities.Unreachable;
+        }
+
         // perf, not correctness
         internal override CSharpCompilation DeclaringCompilation => null;
 

src/Compilers/CSharp/Portable/Symbols/MethodSymbol.cs

@@ -1159,6 +1159,19 @@ internal virtual void AddSynthesizedReturnTypeAttributes(PEModuleBuilder moduleB
             {
                 AddSynthesizedAttribute(ref attributes, moduleBuilder.SynthesizeIsReadOnlyAttribute(this));
             }
+
+            var compilation = this.DeclaringCompilation;
+            var type = this.ReturnType;
+
+            if (type.ContainsDynamic() && compilation.HasDynamicEmitAttributes())
+            {
+                AddSynthesizedAttribute(ref attributes, compilation.SynthesizeDynamicAttribute(type, this.ReturnTypeCustomModifiers.Length + this.RefCustomModifiers.Length, this.RefKind));
+            }
+
+            if (type.ContainsTupleNames() && compilation.HasTupleNamesAttributes)
+            {
+                AddSynthesizedAttribute(ref attributes, compilation.SynthesizeTupleNamesAttribute(type));
+            }
         }
 
         IMethodSymbol IMethodSymbol.Construct(params ITypeSymbol[] arguments)

src/Compilers/CSharp/Portable/Symbols/Source/SourceClonedParameterSymbol.cs

@@ -3,8 +3,6 @@
 using System;
 using System.Collections.Immutable;
 using System.Diagnostics;
-using Microsoft.CodeAnalysis.CSharp.Emit;
-using Microsoft.CodeAnalysis.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.CSharp.Symbols
 {
@@ -158,16 +156,6 @@ internal override bool IsCallerMemberName
             get { return _originalParam.IsCallerMemberName; }
         }
 
-        internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
-        {
-            base.AddSynthesizedAttributes(moduleBuilder, ref attributes);
-
-            if (this.RefKind == RefKind.RefReadOnly)
-            {
-                AddSynthesizedAttribute(ref attributes, moduleBuilder.SynthesizeIsReadOnlyAttribute(this));
-            }
-        }
-
         #endregion
     }
 }

src/Compilers/CSharp/Portable/Symbols/Source/SourceMemberMethodSymbol.cs

@@ -964,23 +964,6 @@ public sealed override ImmutableArray<CSharpAttributeData> GetReturnTypeAttribut
             return this.GetReturnTypeAttributesBag().Attributes;
         }
 
-        internal override void AddSynthesizedReturnTypeAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
-        {
-            base.AddSynthesizedReturnTypeAttributes(moduleBuilder, ref attributes);
-
-            if (this.ReturnType.ContainsDynamic())
-            {
-                var compilation = this.DeclaringCompilation;
-                AddSynthesizedAttribute(ref attributes, compilation.SynthesizeDynamicAttribute(this.ReturnType, this.ReturnTypeCustomModifiers.Length + this.RefCustomModifiers.Length, this.RefKind));
-            }
-
-            if (ReturnType.ContainsTupleNames())
-            {
-                AddSynthesizedAttribute(ref attributes,
-                    DeclaringCompilation.SynthesizeTupleNamesAttribute(ReturnType));
-            }
-        }
-
         internal override CSharpAttributeData EarlyDecodeWellKnownAttribute(ref EarlyDecodeWellKnownAttributeArguments<EarlyWellKnownAttributeBinder, NamedTypeSymbol, AttributeSyntax, AttributeLocation> arguments)
         {
             Debug.Assert(arguments.SymbolPart == AttributeLocation.None || arguments.SymbolPart == AttributeLocation.Return);

src/Compilers/CSharp/Portable/Symbols/Source/SourceParameterSymbol.cs

@@ -3,10 +3,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics;
 using System.Threading;
-using Microsoft.CodeAnalysis.CSharp.Emit;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.Emit;
-using Microsoft.CodeAnalysis.PooledObjects;
 
 namespace Microsoft.CodeAnalysis.CSharp.Symbols
 {
@@ -253,16 +250,6 @@ public override bool IsImplicitlyDeclared
             }
         }
 
-        internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
-        {
-            base.AddSynthesizedAttributes(moduleBuilder, ref attributes);
-
-            if (this.RefKind == RefKind.In)
-            {
-                AddSynthesizedAttribute(ref attributes, moduleBuilder.SynthesizeIsReadOnlyAttribute(this));
-            }
-        }
-
         internal override bool IsMetadataIn => RefKind == RefKind.In;
 
         internal override bool IsMetadataOut => RefKind == RefKind.Out;

src/Compilers/CSharp/Portable/Symbols/Source/SourceParameterSymbolBase.cs

@@ -88,6 +88,11 @@ internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, r
                 AddSynthesizedAttribute(ref attributes,
                     compilation.SynthesizeTupleNamesAttribute(Type));
             }
+
+            if (this.RefKind == RefKind.RefReadOnly)
+            {
+                AddSynthesizedAttribute(ref attributes, moduleBuilder.SynthesizeIsReadOnlyAttribute(this));
+            }
         }
 
         internal abstract ParameterSymbol WithCustomModifiersAndParams(TypeSymbol newType, ImmutableArray<CustomModifier> newCustomModifiers, ImmutableArray<CustomModifier> newRefCustomModifiers, bool newIsParams);

src/Compilers/CSharp/Portable/Symbols/Synthesized/SynthesizedImplementationMethod.cs

@@ -81,25 +81,6 @@ public sealed override ImmutableArray<CustomModifier> RefCustomModifiers
 
         #endregion
 
-        internal override void AddSynthesizedAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
-        {
-            base.AddSynthesizedAttributes(moduleBuilder, ref attributes);
-
-            var compilation = this.DeclaringCompilation;
-            if (this.ReturnType.ContainsDynamic() && compilation.HasDynamicEmitAttributes() && compilation.CanEmitBoolean())
-            {
-                AddSynthesizedAttribute(ref attributes, compilation.SynthesizeDynamicAttribute(this.ReturnType, this.ReturnTypeCustomModifiers.Length + this.RefCustomModifiers.Length, this.RefKind));
-            }
-
-            if (ReturnType.ContainsTupleNames() &&
-                compilation.HasTupleNamesAttributes &&
-                compilation.CanEmitSpecialType(SpecialType.System_String))
-            {
-                AddSynthesizedAttribute(ref attributes,
-                    compilation.SynthesizeTupleNamesAttribute(ReturnType));
-            }
-        }
-
         internal sealed override bool GenerateDebugInfo
         {
             get { return _generateDebugInfo; }

src/Compilers/CSharp/Test/Emit/CodeGen/CodeGenDynamicTests.cs

@@ -683,8 +683,17 @@ public IEnumerable<dynamic> M1()
                             break;
 
                         case SymbolKind.Method:
-                            // Dev11 marks return type of GetEnumerator with DynamicAttribute, we don't
-                            Assert.Equal(0, ((MethodSymbol)member).GetReturnTypeAttributes().Length);
+                            var attributes = ((MethodSymbol)member).GetReturnTypeAttributes();
+                            switch (member.MetadataName)
+                            {
+                                case "System.Collections.Generic.IEnumerator<dynamic>.get_Current":
+                                case "System.Collections.Generic.IEnumerable<dynamic>.GetEnumerator":
+                                    Assert.Equal(1, attributes.Length);
+                                    break;
+                                default:
+                                    Assert.Equal(0, attributes.Length);
+                                    break;
+                            }
                             break;
 
                         case SymbolKind.Property:

src/ExpressionEvaluator/CSharp/Source/ExpressionCompiler/Symbols/EEMethodSymbol.cs

@@ -697,24 +697,6 @@ private static TypeSymbol CalculateReturnType(CSharpCompilation compilation, Bou
             }
         }
 
-        internal override void AddSynthesizedReturnTypeAttributes(PEModuleBuilder moduleBuilder, ref ArrayBuilder<SynthesizedAttributeData> attributes)
-        {
-            base.AddSynthesizedReturnTypeAttributes(moduleBuilder, ref attributes);
-
-            var compilation = this.DeclaringCompilation;
-            var returnType = this.ReturnType;
-
-            if (returnType.ContainsDynamic() && compilation.HasDynamicEmitAttributes())
-            {
-                AddSynthesizedAttribute(ref attributes, compilation.SynthesizeDynamicAttribute(returnType, ReturnTypeCustomModifiers.Length + RefCustomModifiers.Length, RefKind));
-            }
-
-            if (returnType.ContainsTupleNames() && compilation.HasTupleNamesAttributes)
-            {
-                AddSynthesizedAttribute(ref attributes, compilation.SynthesizeTupleNamesAttribute(returnType));
-            }
-        }
-
         internal override int CalculateLocalSyntaxOffset(int localPosition, SyntaxTree localTree)
         {
             return localPosition;

src/ExpressionEvaluator/CSharp/Test/ExpressionCompiler/ReferencedModulesTests.cs

@@ -1010,6 +1010,11 @@ internal override IEnumerable<INamespaceTypeDefinition> GetTopLevelTypesCore(Emi
                 }
             }
 
+            internal override SynthesizedAttributeData SynthesizeEmbeddedAttribute()
+            {
+                throw new NotImplementedException();
+            }
+
             public override int CurrentGenerationOrdinal => _builder.CurrentGenerationOrdinal;
 
             public override ISourceAssemblySymbolInternal SourceAssemblyOpt => _builder.SourceAssemblyOpt;

src/Test/Utilities/Portable/Metadata/MetadataReaderUtils.cs

@@ -156,8 +156,9 @@ public static StringHandle GetName(this MetadataReader reader, EntityHandle toke
             switch (token.Kind)
             {
                 case HandleKind.TypeReference:
-                    var typeRef = reader.GetTypeReference((TypeReferenceHandle)token);
-                    return typeRef.Name;
+                    return reader.GetTypeReference((TypeReferenceHandle)token).Name;
+                case HandleKind.TypeDefinition:
+                    return reader.GetTypeDefinition((TypeDefinitionHandle)token).Name;
                 default:
                     throw ExceptionUtilities.UnexpectedValue(token.Kind);
             }
@@ -172,6 +173,25 @@ public static IEnumerable<CustomAttributeRow> GetCustomAttributeRows(this Metada
             }
         }
 
+        public static string GetCustomAttributeName(this MetadataReader reader, CustomAttributeRow row)
+        {
+            EntityHandle parent;
+            var token = row.ConstructorToken;
+            switch (token.Kind)
+            {
+                case HandleKind.MemberReference:
+                    parent = reader.GetMemberReference((MemberReferenceHandle)token).Parent;
+                    break;
+                case HandleKind.MethodDefinition:
+                    parent = reader.GetMethodDefinition((MethodDefinitionHandle)token).GetDeclaringType();
+                    break;
+                default:
+                    throw ExceptionUtilities.UnexpectedValue(token.Kind);
+            }
+            var strHandle = reader.GetName(parent);
+            return reader.GetString(strHandle);
+        }
+
         public static bool IsIncluded(this ImmutableArray<byte> metadata, string str)
         {
             var builder = ArrayBuilder<byte>.GetInstance();