cleanup

diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index f14f1817568089f15f695b1893d8e27773d5c29e..bf81d5b53676fd8bda73a9999a6155ae7323c1fb 100644 (file)
--- a/Cython/Compiler/ExprNodes.py
+++ b/Cython/Compiler/ExprNodes.py
@@ -2471,9 +2471,6 @@ class SimpleCallNode(CallNode):
             arg_list_code.append(actual_arg.result())
         result = "%s(%s)" % (self.function.result(),
             ', '.join(arg_list_code))
-#        if self.wrapper_call or \
-#                self.function.entry.is_unbound_cmethod and self.function.entry.type.is_overridable:
-#            result = "(%s = 1, %s)" % (Naming.skip_dispatch_cname, result)
         return result
     
     def generate_result_code(self, code):

diff --git a/Cython/Compiler/ModuleNode.py b/Cython/Compiler/ModuleNode.py
index 5552b521cb3b031f6186b1f8034994c04fbb1351..5fc77ca53498455b23d90f39ef4ae029ee72cbfa 100644 (file)
--- a/Cython/Compiler/ModuleNode.py
+++ b/Cython/Compiler/ModuleNode.py
@@ -1691,8 +1691,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
             code.putln(code.error_goto_if_neg("__Pyx_InitCachedBuiltins()",
                                               self.pos))
 
-        code.putln("%s = 0;" % Naming.skip_dispatch_cname);
-
         code.putln("/*--- Global init code ---*/")
         self.generate_global_init_code(env, code)
 

diff --git a/Cython/Compiler/Nodes.py b/Cython/Compiler/Nodes.py
index a1abe76a43bbc00153439826eb22acd807c9f30b..8815de261d622223c1d6a681fab813f7121467b8 100644 (file)
--- a/Cython/Compiler/Nodes.py
+++ b/Cython/Compiler/Nodes.py
@@ -4882,11 +4882,7 @@ utility_function_predeclarations = \
 
 typedef struct {PyObject **p; char *s; long n; char is_unicode; char intern; char is_identifier;} __Pyx_StringTabEntry; /*proto*/
 
-""" + """
-
-static int %(skip_dispatch_cname)s = 0;
-
-""" % { 'skip_dispatch_cname': Naming.skip_dispatch_cname }
+"""
 
 if Options.gcc_branch_hints:
     branch_prediction_macros = \