From 1f2eb5a093e7b7d8074b915a5e2a5ba053b20f37 Mon Sep 17 00:00:00 2001
From: Justin Viiret <justin.viiret@intel.com>
Date: Thu, 3 Aug 2017 11:33:42 +1000
Subject: [PATCH] rose_build_lookaround: use vector in trimLiterals

---
 src/rose/rose_build_lookaround.cpp | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/src/rose/rose_build_lookaround.cpp b/src/rose/rose_build_lookaround.cpp
index dd495fd3..7cc1c584 100644
--- a/src/rose/rose_build_lookaround.cpp
+++ b/src/rose/rose_build_lookaround.cpp
@@ -485,19 +485,17 @@ vector<LookProto> findLiteralReach(const rose_literal_id &lit) {
 }
 
 static
-map<s32, CharReach> findLiteralReach(const RoseBuildImpl &build,
-                                     const RoseVertex v) {
+vector<LookProto> findLiteralReach(const RoseBuildImpl &build,
+                                   const RoseVertex v) {
     bool first = true;
-    map<s32, CharReach> look;
+    vector<LookProto> look;
 
     for (u32 lit_id : build.g[v].literals) {
         const rose_literal_id &lit = build.literals.at(lit_id);
         auto lit_look = findLiteralReach(lit);
 
         if (first) {
-            for (auto &p : lit_look) {
-                look.emplace(p.offset, p.reach);
-            }
+            look = std::move(lit_look);
             first = false;
             continue;
         }
@@ -512,22 +510,21 @@ map<s32, CharReach> findLiteralReach(const RoseBuildImpl &build,
                 look.erase(it, end(look));
                 break;
             }
-            if (it->first < jt->offset) {
+            if (it->offset < jt->offset) {
                 // Offset is present in look but not in lit_look, erase.
                 it = look.erase(it);
-            } else if (it->first > jt->offset) {
+            } else if (it->offset > jt->offset) {
                 // Offset is preset in lit_look but not in look, ignore.
                 ++jt;
             } else {
                 // Offset is present in both, union its reach with look.
-                it->second |= jt->reach;
+                it->reach |= jt->reach;
                 ++it;
                 ++jt;
             }
         }
     }
 
-    DEBUG_PRINTF("lit lookaround: %s\n", dump(look).c_str());
     return look;
 }
 
@@ -541,11 +538,11 @@ void trimLiterals(const RoseBuildImpl &build, const RoseVertex v,
     DEBUG_PRINTF("pre-trim lookaround: %s\n", dump(look).c_str());
 
     for (const auto &m : findLiteralReach(build, v)) {
-        auto it = look.find(m.first);
+        auto it = look.find(m.offset);
         if (it == end(look)) {
             continue;
         }
-        if (m.second.isSubsetOf(it->second)) {
+        if (m.reach.isSubsetOf(it->second)) {
             DEBUG_PRINTF("can trim entry at %d\n", it->first);
             look.erase(it);
         }