merge

Cython/Compiler/Optimize.py

@@ -1661,8 +1661,8 @@ class InlineDefNodeCalls(Visitor.CythonTransform):
         function_name = node.function
         if not function_name.is_name:
             return node
-        if (function_name.cf_state is None or
-            not function_name.cf_state.is_single):
+        if (function_name.cf_state is None   # global scope
+                or not function_name.cf_state.is_single):
             return node
         function = function_name.cf_state.one().rhs
         if not isinstance(function, ExprNodes.PyCFunctionNode):

Demos/benchmarks/setup.py

 from distutils.core import setup
 from Cython.Build import cythonize
 
+directives = {
+    'optimize.inline_defnode_calls': True
+}
+
 setup(
   name = 'benchmarks',
-  ext_modules = cythonize("*.py", language_level=3, annotate=True),
+  ext_modules = cythonize("*.py", language_level=3, annotate=True,
+                          compiler_directives=directives),
 )

tests/run/closure_inlining.pyx

@@ -75,3 +75,13 @@ def test_starred(a):
     def inner(a, *args, **kwargs):
         return a, args, kwargs
     return inner(a)
+
+
+def test_global_calls_still_work():
+    """
+    >>> global_call_result
+    123
+    """
+    return 123
+
+global_call_result = test_global_calls_still_work()