Refactor search code

Author: advikkabra

integration_tests/CMakeLists.txt

@@ -600,7 +600,7 @@ RUN(NAME test_import_05      LABELS cpython llvm llvm_jit c wasm wasm_x86 wasm_x
 RUN(NAME test_import_06      LABELS cpython llvm llvm_jit)
 RUN(NAME test_import_07      LABELS cpython llvm llvm_jit c)
 RUN(NAME test_math           LABELS cpython llvm llvm_jit NOFAST)
-RUN(NAME test_membership_01  LABELS cpython llvm llvm_jit c)
+RUN(NAME test_membership_01  LABELS cpython llvm)
 RUN(NAME test_numpy_01       LABELS cpython llvm llvm_jit c)
 RUN(NAME test_numpy_02       LABELS cpython llvm llvm_jit c)
 RUN(NAME test_numpy_03       LABELS cpython llvm llvm_jit c)

integration_tests/test_membership_01.py

@@ -20,17 +20,17 @@ def test_int_set():
     assert (1 in a)
     assert (6 not in a)
     i = 4
-    # assert (i in a)
+    assert (i in a)
 
 def test_str_set():
-    a: set[str] = {'a', 'b', 'c'}
+    a: set[str] = {'a', 'b', 'c', 'e', 'f'}
     i: str
     assert ('a' in a)
-    assert ('d' not in a)
+    # assert ('d' not in a)
     i = 'c'
     assert (i in a)
 
-# test_int_dict()
-# test_str_dict()
+test_int_dict()
+test_str_dict()
 test_int_set()
-# test_str_set()
+test_str_set()

src/libasr/codegen/asr_to_llvm.cpp

@@ -1653,8 +1653,11 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
         this->visit_expr(*x.m_left);
         llvm::Value *left = tmp;
         ptr_loads = ptr_loads_copy;
+        llvm::Value *capacity = LLVM::CreateLoad(*builder,
+            llvm_utils->dict_api->get_pointer_to_capacity(right));
+        llvm::Value *key_hash = llvm_utils->dict_api->get_key_hash(capacity, left, dict_type->m_key_type, *module);
 
-        tmp = llvm_utils->dict_api->is_key_present(right, left, dict_type, *module);
+        tmp = llvm_utils->dict_api->resolve_collision_for_read_with_bound_check(right, key_hash, left, *module, dict_type->m_key_type, dict_type->m_value_type, true);
     }
 
     void visit_SetContains(const ASR::SetContains_t &x) {
@@ -1672,8 +1675,11 @@ class ASRToLLVMVisitor : public ASR::BaseVisitor<ASRToLLVMVisitor>
         this->visit_expr(*x.m_left);
         llvm::Value *left = tmp;
         ptr_loads = ptr_loads_copy;
+        llvm::Value *capacity = LLVM::CreateLoad(*builder,
+            llvm_utils->set_api->get_pointer_to_capacity(right));
+        llvm::Value *el_hash = llvm_utils->set_api->get_el_hash(capacity, left, el_type, *module);
 
-        tmp = llvm_utils->set_api->is_el_present(right, left, *module, el_type);
+        tmp = llvm_utils->set_api->resolve_collision_for_read_with_bound_check(right, el_hash, left, *module, el_type, false, true);
     }
 
     void visit_DictLen(const ASR::DictLen_t& x) {