Merge pull request #195 from maximusron/numba-dev

Remove deprecated use of llvmfnty in numba extension
wlav · Oct 10, 2023 · b767348 · b767348
2 parents 6ef45d7 + fdd06fa
commit b767348
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/python/cppyy/numba_ext.py b/python/cppyy/numba_ext.py
@@ -16,7 +16,6 @@
 import numba.core.typing as nb_typing
 
 from llvmlite import ir
-from llvmlite.llvmpy.core import Type as llvmfnty
 from numba.extending import make_attribute_wrapper
 import itertools
 import re
@@ -170,7 +169,6 @@ def cpp2ir(val):
                 type_2 = _cpp2ir[val[:-1]]
                 return ir.PointerType(type_2)
 
-
 #
 # C++ function pointer -> Numba
 #
@@ -607,35 +605,31 @@ def make_implclass(context, builder, typ, **kwargs):
   # C++ object to Python proxy wrapping for returns from Numba trace
     @nb_ext.box(ImplClassType)
     def box_instance(typ, val, c):
+        assert not "requires object model and passing of intact object, not memberwise copy"
 
         global cppyy_from_voidptr
 
-        implclass = make_implclass(c.context, c.builder, typ)
-        classobj = c.pyapi.unserialize(c.pyapi.serialize_object(cpp_types.Instance))
-        pyobj = c.context.get_argument_type(nb_types.pyobject)
-
         if type(val) == ir.Constant:
             if val.constant == ir.Undefined:
                 assert not "Value passed to instance boxing is undefined"
+                return NULL
+
+        implclass = make_implclass(c.context, c.builder, typ)
+        classobj = c.pyapi.unserialize(c.pyapi.serialize_object(cpp_types.Instance))
+        pyobj = c.context.get_argument_type(nb_types.pyobject)
 
         box_list = []
 
         model = implclass._datamodel
         cfr = CppClassFieldResolver(c.context)
 
         for i in typ._scope.__dict__:
-            if isinstance(cfr.generic_resolve(typ, i), CppFunctionNumbaType):
-                ret_type = CppFunctionNumbaType
-                fnty = llvmfnty.function(ir_voidptr, [pyobj, pyobj, pyobj])
-                fn = c.pyapi._get_function(fnty, name=i)
-                box_list.append(c.builder.call(fn, [c.pyapi.get_null_object()]*3))
-            elif isinstance(cfr.generic_resolve(typ, i), nb_types.Type):
+            if isinstance(cfr.generic_resolve(typ, i), nb_types.Type):
                 box_list.append(c.box(cfr.generic_resolve(typ, i), getattr(implclass, i)))
 
         box_res = c.pyapi.call_function_objargs(
             classobj, tuple(box_list)
         )
-
         # Required for nopython mode, numba nrt requres each member box call to decref since it steals the reference
         for i in box_list:
             c.pyapi.decref(i)