@@ -62,7 +62,6 @@ protected LinkContext Context {
6262 protected Queue < ( MethodDefinition , DependencyInfo , MessageOrigin ) > _methods ;
6363 protected Dictionary < MethodDefinition , MarkScopeStack . Scope > _virtual_methods ;
6464 protected Queue < AttributeProviderPair > _assemblyLevelAttributes ;
65- readonly List < AttributeProviderPair > _ivt_attributes ;
6665 protected Queue < ( AttributeProviderPair , DependencyInfo , MarkScopeStack . Scope ) > _lateMarkedAttributes ;
6766 protected List < ( TypeDefinition , MarkScopeStack . Scope ) > _typesWithInterfaces ;
6867 protected HashSet < AssemblyDefinition > _dynamicInterfaceCastableImplementationTypesDiscovered ;
@@ -222,7 +221,6 @@ public MarkStep ()
222221 _methods = new Queue < ( MethodDefinition , DependencyInfo , MessageOrigin ) > ( ) ;
223222 _virtual_methods = new Dictionary < MethodDefinition , MarkScopeStack . Scope > ( ) ;
224223 _assemblyLevelAttributes = new Queue < AttributeProviderPair > ( ) ;
225- _ivt_attributes = new List < AttributeProviderPair > ( ) ;
226224 _lateMarkedAttributes = new Queue < ( AttributeProviderPair , DependencyInfo , MarkScopeStack . Scope ) > ( ) ;
227225 _typesWithInterfaces = new List < ( TypeDefinition , MarkScopeStack . Scope ) > ( ) ;
228226 _dynamicInterfaceCastableImplementationTypesDiscovered = new HashSet < AssemblyDefinition > ( ) ;
@@ -288,42 +286,6 @@ protected virtual void Complete ()
288286 }
289287 }
290288
291- bool ProcessInternalsVisibleAttributes ( )
292- {
293- bool marked_any = false ;
294- foreach ( var attr in _ivt_attributes ) {
295-
296- var provider = attr . Provider ;
297- Debug . Assert ( attr . Provider is ModuleDefinition or AssemblyDefinition ) ;
298- var assembly = ( provider is ModuleDefinition module ) ? module . Assembly : provider as AssemblyDefinition ;
299-
300- using var assemblyScope = ScopeStack . PushLocalScope ( new MessageOrigin ( assembly ) ) ;
301-
302- if ( ! Annotations . IsMarked ( attr . Attribute ) && IsInternalsVisibleAttributeAssemblyMarked ( attr . Attribute ) ) {
303- MarkCustomAttribute ( attr . Attribute , new DependencyInfo ( DependencyKind . AssemblyOrModuleAttribute , attr . Provider ) ) ;
304- marked_any = true ;
305- }
306- }
307-
308- return marked_any ;
309-
310- bool IsInternalsVisibleAttributeAssemblyMarked ( CustomAttribute ca )
311- {
312- System . Reflection . AssemblyName an ;
313- try {
314- an = new System . Reflection . AssemblyName ( ( string ) ca . ConstructorArguments [ 0 ] . Value ) ;
315- } catch {
316- return false ;
317- }
318-
319- var assembly = Context . GetLoadedAssembly ( an . Name ! ) ;
320- if ( assembly == null )
321- return false ;
322-
323- return Annotations . IsMarked ( assembly . MainModule ) ;
324- }
325- }
326-
327289 static bool TypeIsDynamicInterfaceCastableImplementation ( TypeDefinition type )
328290 {
329291 if ( ! type . IsInterface || ! type . HasInterfaces || ! type . HasCustomAttributes )
@@ -416,8 +378,7 @@ void Process ()
416378 ProcessMarkedPending ( ) ||
417379 ProcessLazyAttributes ( ) ||
418380 ProcessLateMarkedAttributes ( ) ||
419- MarkFullyPreservedAssemblies ( ) ||
420- ProcessInternalsVisibleAttributes ( ) ) ;
381+ MarkFullyPreservedAssemblies ( ) ) ;
421382
422383 ProcessPendingTypeChecks ( ) ;
423384 }
@@ -1169,6 +1130,9 @@ protected virtual bool ShouldMarkCustomAttribute (CustomAttribute ca, ICustomAtt
11691130 case "System.Runtime.InteropServices.InterfaceTypeAttribute" :
11701131 case "System.Runtime.InteropServices.GuidAttribute" :
11711132 return true ;
1133+ // May be implicitly used by the runtime
1134+ case "System.Runtime.CompilerServices.InternalsVisibleToAttribute" :
1135+ return true ;
11721136 }
11731137
11741138 TypeDefinition ? type = Context . Resolve ( attr_type ) ;
@@ -1546,10 +1510,7 @@ bool ProcessLazyAttributes ()
15461510 if ( IsAttributeRemoved ( customAttribute , resolved . DeclaringType ) && Annotations . GetAction ( CustomAttributeSource . GetAssemblyFromCustomAttributeProvider ( assemblyLevelAttribute . Provider ) ) == AssemblyAction . Link )
15471511 continue ;
15481512
1549- if ( customAttribute . AttributeType . IsTypeOf ( "System.Runtime.CompilerServices" , "InternalsVisibleToAttribute" ) && ! Annotations . IsMarked ( customAttribute ) ) {
1550- _ivt_attributes . Add ( assemblyLevelAttribute ) ;
1551- continue ;
1552- } else if ( ! ShouldMarkTopLevelCustomAttribute ( assemblyLevelAttribute , resolved ) ) {
1513+ if ( ! ShouldMarkTopLevelCustomAttribute ( assemblyLevelAttribute , resolved ) ) {
15531514 skippedItems . Add ( assemblyLevelAttribute ) ;
15541515 continue ;
15551516 }
0 commit comments