From 2b31fb0f334d13520e652353b745341d1e76aa86 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Mon, 24 Mar 2014 15:49:36 +0100
Subject: [PATCH 1/4] assert: stringmap_merge's arguments should use the same
 memory arena

---
 src/backends/llk.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/backends/llk.c b/src/backends/llk.c
index 2bc39daf..387dfd6a 100644
--- a/src/backends/llk.c
+++ b/src/backends/llk.c
@@ -84,6 +84,8 @@ static void *combine_entries(HHashSet *workset, void *dst, const void *src)
 // note: reuses parts of src to build dst!
 static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
 {
+  assert(src->arena == dst->arena);
+
   if(src->epsilon_branch) {
     if(dst->epsilon_branch)
       dst->epsilon_branch =

From 0970b150349759cca4e0993ce9f2a73eb570b2e8 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Mon, 24 Mar 2014 17:22:32 +0100
Subject: [PATCH 2/4] add function h_stringmap_copy

---
 src/cfgrammar.c | 7 +++++++
 src/cfgrammar.h | 1 +
 2 files changed, 8 insertions(+)

diff --git a/src/cfgrammar.c b/src/cfgrammar.c
index 196d9d3c..b33ad862 100644
--- a/src/cfgrammar.c
+++ b/src/cfgrammar.c
@@ -281,6 +281,13 @@ void h_stringmap_update(HStringMap *m, const HStringMap *n)
   h_hashtable_merge(combine_stringmap, m->char_branches, n->char_branches);
 }
 
+HStringMap *h_stringmap_copy(HArena *a, const HStringMap *m)
+{
+  HStringMap *res = h_stringmap_new(a);
+  h_stringmap_update(res, m);
+  return res;
+}
+
 /* Replace all occurances of old in m with new.
  * If old is NULL, replace all values in m with new.
  * If new is NULL, remove the respective values.
diff --git a/src/cfgrammar.h b/src/cfgrammar.h
index 193f8ca3..9cefc62e 100644
--- a/src/cfgrammar.h
+++ b/src/cfgrammar.h
@@ -40,6 +40,7 @@ typedef struct HStringMap_ {
 } HStringMap;
 
 HStringMap *h_stringmap_new(HArena *a);
+HStringMap *h_stringmap_copy(HArena *a, const HStringMap *m);
 void h_stringmap_put_end(HStringMap *m, void *v);
 void h_stringmap_put_epsilon(HStringMap *m, void *v);
 void h_stringmap_put_after(HStringMap *m, uint8_t c, HStringMap *ends);

From 797bdb7224f84b05b728fe27cf9af19b3b774272 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Mon, 24 Mar 2014 17:22:52 +0100
Subject: [PATCH 3/4] copy source stringmap as necessary in stringmap_merge

---
 src/backends/llk.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backends/llk.c b/src/backends/llk.c
index 387dfd6a..3f369224 100644
--- a/src/backends/llk.c
+++ b/src/backends/llk.c
@@ -81,11 +81,8 @@ static void *combine_entries(HHashSet *workset, void *dst, const void *src)
 
 // add the mappings of src to dst, marking conflicts and adding the conflicting
 // values to workset.
-// note: reuses parts of src to build dst!
 static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
 {
-  assert(src->arena == dst->arena);
-
   if(src->epsilon_branch) {
     if(dst->epsilon_branch)
       dst->epsilon_branch =
@@ -120,10 +117,13 @@ static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
 
       if(src_) {
         HStringMap *dst_ = h_hashtable_get(dst->char_branches, (void *)c);
-        if(dst_)
+        if(dst_) {
           stringmap_merge(workset, dst_, src_);
-        else
+        } else {
+	  if(src_->arena != dst->arena)
+	    src_ = h_stringmap_copy(dst->arena, src_);
           h_hashtable_put(dst->char_branches, (void *)c, src_);
+	}
       }
     }
   }

From 6875dc3e53745def90650c55d556445c3fcce766 Mon Sep 17 00:00:00 2001
From: "Sven M. Hallberg" <pesco@khjk.org>
Date: Mon, 24 Mar 2014 17:30:23 +0100
Subject: [PATCH 4/4] retab

---
 src/backends/llk.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/backends/llk.c b/src/backends/llk.c
index 3f369224..89151e6f 100644
--- a/src/backends/llk.c
+++ b/src/backends/llk.c
@@ -86,7 +86,7 @@ static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
   if(src->epsilon_branch) {
     if(dst->epsilon_branch)
       dst->epsilon_branch =
-	combine_entries(workset, dst->epsilon_branch, src->epsilon_branch);
+        combine_entries(workset, dst->epsilon_branch, src->epsilon_branch);
     else
       dst->epsilon_branch = src->epsilon_branch;
   } else {
@@ -100,7 +100,7 @@ static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
   if(src->end_branch) {
     if(dst->end_branch)
       dst->end_branch =
-	combine_entries(workset, dst->end_branch, src->end_branch);
+        combine_entries(workset, dst->end_branch, src->end_branch);
     else
       dst->end_branch = src->end_branch;
   }
@@ -120,10 +120,10 @@ static void stringmap_merge(HHashSet *workset, HStringMap *dst, HStringMap *src)
         if(dst_) {
           stringmap_merge(workset, dst_, src_);
         } else {
-	  if(src_->arena != dst->arena)
-	    src_ = h_stringmap_copy(dst->arena, src_);
+          if(src_->arena != dst->arena)
+            src_ = h_stringmap_copy(dst->arena, src_);
           h_hashtable_put(dst->char_branches, (void *)c, src_);
-	}
+        }
       }
     }
   }