<AssemblyAttribute>

emitted as `[assembly:]` attribute, not module
peachpiecompiler · Apr 22, 2024 · cbabfb4 · cbabfb4
1 parent 7699c78
commit cbabfb4
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 12 deletions.
diff --git a/src/Peachpie.CodeAnalysis/Emitter/Model/PEModuleBuilder.cs b/src/Peachpie.CodeAnalysis/Emitter/Model/PEModuleBuilder.cs
@@ -18,6 +18,7 @@
 using Pchp.CodeAnalysis.Emitter;
 using Pchp.CodeAnalysis.Utilities;
 using Pchp.CodeAnalysis.CodeGen;
+using Pchp.CodeAnalysis.Semantics;
 
 namespace Pchp.CodeAnalysis.Emit
 {
@@ -222,6 +223,17 @@ public ArrayMethods ArrayMethods
                 }
             }
 
+            // [assembly: ...]
+            if (Compilation.Options.AssemblyAttributes != null)
+            {
+                var binder = new SemanticsBinder(Compilation, file: null);
+
+                foreach (var attr in Compilation.Options.AssemblyAttributes)
+                {
+                    yield return binder.BindAttribute(attr);
+                }
+            }
+
             //
             yield break;
         }

diff --git a/src/Peachpie.CodeAnalysis/Semantics/SemanticsBinder.cs b/src/Peachpie.CodeAnalysis/Semantics/SemanticsBinder.cs
@@ -328,7 +328,7 @@ public ImmutableArray<AttributeData> BindAttributes(IReadOnlyList<AST.IAttribute
             return attrs.ToImmutableArray();
         }
 
-        public AttributeData BindAttribute(AST.IAttributeElement a)
+        public SourceCustomAttribute BindAttribute(AST.IAttributeElement a)
         {
             return new SourceCustomAttribute(
                 DeclaringCompilation,

diff --git a/src/Peachpie.CodeAnalysis/Symbols/Source/SourceModuleSymbol.cs b/src/Peachpie.CodeAnalysis/Symbols/Source/SourceModuleSymbol.cs
@@ -164,17 +164,6 @@ IEnumerable<AttributeData> CreateAttributesToEmit()
                 }
             }
 
-            // user assembly attributes
-            if (DeclaringCompilation.Options.AssemblyAttributes != null)
-            {
-                var binder = new SemanticsBinder(DeclaringCompilation, file: null);
-
-                foreach (var attr in DeclaringCompilation.Options.AssemblyAttributes)
-                {
-                    yield return binder.BindAttribute(attr);
-                }
-            }
-
             //
             yield break;
         }