[Tarantool-patches] [PATCH luajit v3 1/4] utils: remove unnecessary insertion in AVL-tree

[Maxim Kokryashkin]

This patch fixes a bug in the AVL-tree implementation,
which produced unnecessary inserts of values into nodes,
instead of replacement.

Needed for tarantool/tarantool#8700
---
 .../tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua | 6 ++----
 tools/utils/avl.lua                                         | 4 ++--
 tools/utils/symtab.lua                                      | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua b/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua
index 30b8a3ca..c448248a 100644
--- a/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua
+++ b/test/tarantool-tests/gh-5813-resolving-of-c-symbols.test.lua
@@ -25,10 +25,8 @@ local function tree_contains(node, name)
   if node == nil then
     return false
   else
-    for i = 1, #node.value do
-      if node.value[i].name == name then
-        return true
-      end
+    if node.value.name == name then
+      return true
     end
     return tree_contains(node.left, name) or tree_contains(node.right, name)
   end
diff --git a/tools/utils/avl.lua b/tools/utils/avl.lua
index d5baa534..81ef9265 100644
--- a/tools/utils/avl.lua
+++ b/tools/utils/avl.lua
@@ -78,7 +78,7 @@ end
 function M.insert(node, key, value)
   assert(key, "Key can't be nil")
   if node == nil then
-    return create_node(key, { value })
+    return create_node(key, value)
   end
 
   if key < node.key then
@@ -86,7 +86,7 @@ function M.insert(node, key, value)
   elseif key > node.key then
     node.right = M.insert(node.right, key, value)
   else
-    table.insert(node.value, value)
+    node.value = value
   end
 
   update_height(node)
diff --git a/tools/utils/symtab.lua b/tools/utils/symtab.lua
index c26a9e8c..7f6c78f0 100644
--- a/tools/utils/symtab.lua
+++ b/tools/utils/symtab.lua
@@ -176,7 +176,7 @@ function M.demangle(symtab, loc)
   local key, value = avl.floor(symtab.cfunc, addr)
 
   if key then
-    return string_format("%s:%#x", value[gen].name, key)
+    return string_format("%s:%#x", value.name, key)
   end
 
   return string_format("CFUNC %#x", addr)
-- 
2.41.0