---

yaml
---
r: 41294
b: refs/heads/snap-stage3
c: 8cb17ad
h: refs/heads/master
v: v3

Author: catamorphism

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 09bb07bed9166105ea961a42b5fff7739ae0d2e9
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 226cd68f13339ae02e606957ebd1d2a3fb1e7aad
+refs/heads/snap-stage3: 8cb17ad0fa983e60c9bcaba75322a7057449df52
 refs/heads/try: 3d5418789064fdb463e872a4e651af1c628a3650
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/rt/rust_crate_map.cpp

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 #include "rust_crate_map.h"
+#include <set>
 
 void iter_module_map(const mod_entry* map,
                      void (*fn)(const mod_entry* entry, void *cookie),
@@ -20,18 +21,27 @@ void iter_module_map(const mod_entry* map,
 
 void iter_crate_map(const cratemap* map,
                     void (*fn)(const mod_entry* map, void *cookie),
-                    void *cookie) {
-    // First iterate this crate
-    iter_module_map(map->entries(), fn, cookie);
-    // Then recurse on linked crates
-    // FIXME (#2673) this does double work in diamond-shaped deps. could
-    //   keep a set of visited addresses, if it turns out to be actually
-    //   slow
-    for (cratemap::iterator i = map->begin(), e = map->end(); i != e; ++i) {
-        iter_crate_map(*i, fn, cookie);
+                    void *cookie,
+                    std::set<const cratemap*>& visited) {
+    if (visited.find(map) == visited.end()) {
+        // Mark this crate visited
+        visited.insert(map);
+        // First iterate this crate
+        iter_module_map(map->entries(), fn, cookie);
+        // Then recurse on linked crates
+        for (cratemap::iterator i = map->begin(),
+                e = map->end(); i != e; ++i) {
+            iter_crate_map(*i, fn, cookie, visited);
+        }
     }
 }
 
+void iter_crate_map(const cratemap* map,
+                    void (*fn)(const mod_entry* map, void *cookie),
+                    void *cookie) {
+    std::set<const cratemap*> visited;
+    iter_crate_map(map, fn, cookie, visited);
+}
 //
 // Local Variables:
 // mode: C++