Merge pull request #3607 from sklam/enh/simplifylowering

Some simplication to lowering
numba · Jan 8, 2019 · d37d5a8 · d37d5a8
2 parents bf692cf + ee16aba
commit d37d5a8
Show file tree

Hide file tree

Showing 9 changed files with 210 additions and 207 deletions.
diff --git a/.flake8 b/.flake8
@@ -41,7 +41,6 @@ exclude =
     numba/pylowering.py
     numba/io_support.py
     numba/parfor.py
-    numba/lowering.py
     numba/numba_entry.py
     numba/stencilparfor.py
     numba/numpy_support.py

diff --git a/numba/datamodel/models.py b/numba/datamodel/models.py
@@ -295,7 +295,6 @@ def __init__(self, dmm, fe_type):
 @register_default(types.Dummy)
 @register_default(types.ExceptionInstance)
 @register_default(types.ExternalFunction)
-@register_default(types.NumbaFunction)
 @register_default(types.Macro)
 @register_default(types.EnumClass)
 @register_default(types.IntEnumClass)

diff --git a/numba/jitclass/base.py b/numba/jitclass/base.py
@@ -150,8 +150,9 @@ def _add_linking_libs(context, call):
     """
     Add the required libs for the callable to allow inlining.
     """
-    for lib in getattr(call, "libs", ()):
-        context.active_code_library.add_linking_library(lib)
+    libs = getattr(call, "libs", ())
+    if libs:
+        context.add_linking_libs(libs)
 
 
 def register_class_type(cls, spec, class_ctor, builder):