simplify self-import filtering

- directly compare pointers instead of module indices - rename e (edge) -> imp (import)
dlang · Oct 7, 2016 · d364c4b · d364c4b
1 parent 6e27f17
commit d364c4b
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/rt/minfo.d b/src/rt/minfo.d
@@ -250,13 +250,14 @@ struct ModuleGroup
                 // preallocate enough space to store all the indexes
                 int *edge = cast(int*)malloc(int.sizeof * _modules.length);
                 size_t nEdges = 0;
-                foreach (e; m.importedModules)
+                foreach (imp; m.importedModules)
                 {
-                    if(auto impidx = e in modIndexes)
+                    if (imp is m) // self-import
+                        continue;
+                    if (auto impidx = imp in modIndexes)
                     {
-                        if (*impidx != i)
-                            if (!bts(reachable, *impidx))
-                                edge[nEdges++] = *impidx;
+                        if (!bts(reachable, *impidx))
+                            edge[nEdges++] = *impidx;
                     }
                 }
                 // trim space to what is needed.