Look for an assembly that's already loaded before trying to load it from a file.

tonyroberts · tonyroberts · commit da2bb408abaa · 2014-06-05T16:41:46.000+01:00
This fixes problems when trying to import pre-loaded assemblies that are embedded as resources.
diff --git a/src/runtime/assemblymanager.cs b/src/runtime/assemblymanager.cs
@@ -208,6 +208,19 @@ public static Assembly LoadAssemblyPath(string name) {
             return assembly;
         }
 
+        //===================================================================
+        // Returns an assembly that's already been loaded
+        //===================================================================
+
+        public static Assembly FindLoadedAssembly(string name) {
+            for (int i = 0; i < assemblies.Count; i++) {
+                Assembly a = (Assembly)assemblies[i];
+                if (a.GetName().Name == name) {
+                    return a;
+                }
+            }
+            return null;
+        }
 
         //===================================================================
         // Given a qualified name of the form A.B.C.D, attempt to load 
@@ -233,7 +246,10 @@ public static bool LoadImplicit(string name, bool warn=true) {
                     if (assemblies == null) {
                         assemblies = new HashSet<Assembly>(AppDomain.CurrentDomain.GetAssemblies());
                     }
-                    Assembly a = LoadAssemblyPath(s);
+                    Assembly a = FindLoadedAssembly(s);
+                    if (a == null) {
+                        a = LoadAssemblyPath(s);
+                    }
                     if (a == null) {
                         a = LoadAssembly(s);
                     }
diff --git a/src/runtime/moduleobject.cs b/src/runtime/moduleobject.cs
@@ -385,7 +385,11 @@ public static Assembly AddReference(string name)
         {
             AssemblyManager.UpdatePath();
             Assembly assembly = null;
-            assembly = AssemblyManager.LoadAssemblyPath(name);
+            assembly = AssemblyManager.FindLoadedAssembly(name);
+            if (assembly == null)
+            {
+                assembly = AssemblyManager.LoadAssemblyPath(name);
+            }
             if (assembly == null)
             {
                 assembly = AssemblyManager.LoadAssembly(name);

Original file line number	Diff line number	Diff line change
`@@ -385,7 +385,11 @@ public static Assembly AddReference(string name)`
`385`	`385`	`{`
`386`	`386`	`AssemblyManager.UpdatePath();`
`387`	`387`	`Assembly assembly = null;`
`388`		`- assembly = AssemblyManager.LoadAssemblyPath(name);`
	`388`	`+ assembly = AssemblyManager.FindLoadedAssembly(name);`
	`389`	`+ if (assembly == null)`
	`390`	`+ {`
	`391`	`+ assembly = AssemblyManager.LoadAssemblyPath(name);`
	`392`	`+ }`
`389`	`393`	`if (assembly == null)`
`390`	`394`	`{`
`391`	`395`	`assembly = AssemblyManager.LoadAssembly(name);`