Initial set of Ward sgen annotations (#5705)

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

diff --git a/mcs/mcs/assembly.cs b/mcs/mcs/assembly.cs
index 85dff2b3c84fcb71651275ea08fb316c379f9d64..aa4c54317a238c7f4490c822e8b9f52ad0dc049a 100644 (file)
--- a/mcs/mcs/assembly.cs
+++ b/mcs/mcs/assembly.cs
@@ -45,18 +45,16 @@ namespace Mono.CSharp
                bool IsFriendAssemblyTo (IAssemblyDefinition assembly);
        }
 
-       public class AssemblyReferenceErrorInfo
+       public class AssemblyReferenceMessageInfo
        {
-               public AssemblyReferenceErrorInfo (AssemblyName dependencyName, string location, string message)
+               public AssemblyReferenceMessageInfo (AssemblyName dependencyName, Action<Report> reportMessage)
                {
                        this.DependencyName = dependencyName;
-                       this.RequestingAssemblyLocation = location;
-                       this.Message = message;
+                       this.ReportMessage = reportMessage;
                }
 
                public AssemblyName DependencyName { get; private set; }
-               public string RequestingAssemblyLocation { get; private set; }
-               public string Message { get; private set; }
+               public Action<Report> ReportMessage { get; private set; }
        }
                 
        public abstract class AssemblyDefinition : IAssemblyDefinition
@@ -456,8 +454,7 @@ namespace Mono.CSharp
                                                // due to type-forwarding
                                                //
                                                if (references.Any (l => l.Name == r.DependencyName.Name)) {
-                                                       Report.SymbolRelatedToPreviousError (r.RequestingAssemblyLocation);
-                                                       Report.Error (1705, r.Message);
+                                                       r.ReportMessage (Report);
                                                }
                                        }
                                }
@@ -592,7 +589,7 @@ namespace Mono.CSharp
                        return public_key_token;
                }
 
-               protected virtual List<AssemblyReferenceErrorInfo> GetNotUnifiedReferences (AssemblyName assemblyName)
+               protected virtual List<AssemblyReferenceMessageInfo> GetNotUnifiedReferences (AssemblyName assemblyName)
                {
                        return null;
                }
@@ -1292,7 +1289,9 @@ namespace Mono.CSharp
                                                        i = loaded.FindIndex (l => l.Item2 == ca);
                                                }
 
-                                               loaded.RemoveAt (i);
+                                               if (i >= 0)
+                                                       loaded.RemoveAt (i);
+
                                                break;
                                        }
                                }