more fixes

diff --git a/src/rose/rose_build_merge.cpp b/src/rose/rose_build_merge.cpp
index 8659f4d6a0ed8debfa0e3baa691cdcf2123be2e4..985315d9b51a4ed442745afab7fba9b1a91d9f9e 100644 (file)
--- a/src/rose/rose_build_merge.cpp
+++ b/src/rose/rose_build_merge.cpp
@@ -1345,7 +1345,7 @@ insertion_ordered_map<left_id, vector<RoseVertex>> get_eng_verts(const RoseGraph
         if (!left) {
             continue;
         }
-        assert(contains(all_reports(left), left.leftfix_report));
+        assert(contains(all_reports(left_id(left)), left.leftfix_report));
         eng_verts[left_id(left)].emplace_back(v);
     }
 

diff --git a/src/rose/rose_build_misc.cpp b/src/rose/rose_build_misc.cpp
index de0ae706409eeae787951b6ba2eb732cc658ada7..d0c630270368de4bd2c1dad3a27d18ee5748f14c 100644 (file)
--- a/src/rose/rose_build_misc.cpp
+++ b/src/rose/rose_build_misc.cpp
@@ -513,8 +513,8 @@ bool roseHasTops(const RoseBuildImpl &build, RoseVertex v) {
             graph_tops.insert(g[e].rose_top);
         }
     }
-
-    return is_subset_of(graph_tops, all_tops(g[v].left));
+    
+    return is_subset_of(graph_tops, all_tops(left_id(g[v].left)));
 }
 #endif
 
@@ -1006,14 +1006,14 @@ bool hasOrphanedTops(const RoseBuildImpl &build) {
         if (g[v].left) {
             if (!build.isRootSuccessor(v)) {
                 // Tops for infixes come from the in-edges.
-                set<u32> &tops = leftfixes[g[v].left];
+                set<u32> &tops = leftfixes[left_id(g[v].left)];
                 for (const auto &e : in_edges_range(v, g)) {
                     tops.insert(g[e].rose_top);
                 }
             }
         }
         if (g[v].suffix) {
-            suffixes[g[v].suffix].insert(g[v].suffix.top);
+            suffixes[suffix_id(g[v].suffix)].insert(g[v].suffix.top);
         }
     }