From 0246605444fdc6482dcbb100e36f1dcb097e7912 Mon Sep 17 00:00:00 2001
From: Andrea Shepard <andrea@persephoneslair.org>
Date: Thu, 17 Nov 2016 23:33:44 +0000
Subject: [PATCH] Fix complement child charset bug
---
src/backends/llvm.c | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/backends/llvm.c b/src/backends/llvm.c
index 49537914..4174b385 100644
--- a/src/backends/llvm.c
+++ b/src/backends/llvm.c
@@ -282,11 +282,15 @@ static int h_llvm_build_charset_exec_plan_impl(HAllocator* mm__, HCharset cs,
/* >= 0 is a flag we have a complement we may need to free later */
estimated_complement_cost = -1;
if (allow_complement) {
+ HCharset child_cs;
+
/* Complement the charset within the range */
memset(&complement_cep, 0, sizeof(complement_cep));
complement_cep.cs = copy_charset(mm__, cs);
- charset_complement(complement_cep.cs);
charset_restrict_to_range(complement_cep.cs, idx_start, idx_end);
+ child_cs = copy_charset(mm__, complement_cep.cs);
+ charset_complement(child_cs);
+ charset_restrict_to_range(child_cs, idx_start, idx_end);
complement_cep.idx_start = idx_start;
complement_cep.idx_end = idx_end;
complement_cep.split_point = 0;
@@ -299,9 +303,10 @@ static int h_llvm_build_charset_exec_plan_impl(HAllocator* mm__, HCharset cs,
* allow_complement = 0 so we never stack two complements
*/
complement_cep.cost = 1 +
- h_llvm_build_charset_exec_plan_impl(mm__, complement_cep.cs, &complement_cep,
+ h_llvm_build_charset_exec_plan_impl(mm__, child_cs, &complement_cep,
complement_cep.children[0], 0, NULL);
estimated_complement_cost = complement_cep.cost;
+ h_free(child_cs);
}
/* Should we just terminate search below a certain scan cost perhaps? */
--
GitLab