Fix issue 4520 due to storage model mismatch

numba/tests/test_dictobject.py

@@ -1229,6 +1229,22 @@ def foo(d):
         # Value is correctly updated
         self.assertPreciseEqual(d[1], np.arange(10, dtype=np.int64) + 100)
 
+    def test_storage_model_mismatch(self):
+        # https://github.com/numba/numba/issues/4520
+        # check for storage model mismatch in refcount ops generation
+        dct = Dict()
+        ref = [
+            ("a", True, "a"),
+            ("b", False, "b"),
+            ("c", False, "c"),
+        ]
+        # populate
+        for x in ref:
+            dct[x] = x
+        # test
+        for i, x in enumerate(ref):
+            self.assertEqual(dct[x], x)
+
 
 class TestDictForbiddenTypes(TestCase):
     def assert_disallow(self, expect, callable):

numba/tests/test_typedlist.py

@@ -742,3 +742,19 @@ def bag_equal(one, two):
             np.testing.assert_allclose(one.array, two.array)
 
         [bag_equal(a, b) for a, b in zip(expected, got)]
+
+    def test_storage_model_mismatch(self):
+        # https://github.com/numba/numba/issues/4520
+        # check for storage model mismatch in refcount ops generation
+        lst = List()
+        ref = [
+            ("a", True, "a"),
+            ("b", False, "b"),
+            ("c", False, "c"),
+        ]
+        # populate
+        for x in ref:
+            lst.append(x)
+        # test
+        for i, x in enumerate(ref):
+            self.assertEqual(lst[i], ref[i])

numba/typedobjectutils.py

@@ -128,16 +128,23 @@ def _get_incref_decref(context, module, datamodel, container_type):
         refct_fnty,
         name='.numba_{}_incref${}'.format(container_type, fe_type),
     )
+
     builder = ir.IRBuilder(incref_fn.append_basic_block())
-    context.nrt.incref(builder, fe_type, builder.load(incref_fn.args[0]))
+    context.nrt.incref(
+        builder, fe_type,
+        datamodel.load_from_data_pointer(builder, incref_fn.args[0]),
+    )
     builder.ret_void()
 
     decref_fn = module.get_or_insert_function(
         refct_fnty,
         name='.numba_{}_decref${}'.format(container_type, fe_type),
     )
     builder = ir.IRBuilder(decref_fn.append_basic_block())
-    context.nrt.decref(builder, fe_type, builder.load(decref_fn.args[0]))
+    context.nrt.decref(
+        builder, fe_type,
+        datamodel.load_from_data_pointer(builder, decref_fn.args[0]),
+    )
     builder.ret_void()
 
     return incref_fn, decref_fn