Commit c6661c76 authored by Robert Bradshaw's avatar Robert Bradshaw

cleanup

parent 397c1d1e
...@@ -2471,9 +2471,6 @@ class SimpleCallNode(CallNode): ...@@ -2471,9 +2471,6 @@ class SimpleCallNode(CallNode):
arg_list_code.append(actual_arg.result()) arg_list_code.append(actual_arg.result())
result = "%s(%s)" % (self.function.result(), result = "%s(%s)" % (self.function.result(),
', '.join(arg_list_code)) ', '.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 return result
def generate_result_code(self, code): def generate_result_code(self, code):
......
...@@ -1691,8 +1691,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode): ...@@ -1691,8 +1691,6 @@ class ModuleNode(Nodes.Node, Nodes.BlockNode):
code.putln(code.error_goto_if_neg("__Pyx_InitCachedBuiltins()", code.putln(code.error_goto_if_neg("__Pyx_InitCachedBuiltins()",
self.pos)) self.pos))
code.putln("%s = 0;" % Naming.skip_dispatch_cname);
code.putln("/*--- Global init code ---*/") code.putln("/*--- Global init code ---*/")
self.generate_global_init_code(env, code) self.generate_global_init_code(env, code)
......
...@@ -4882,11 +4882,7 @@ utility_function_predeclarations = \ ...@@ -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*/ 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: if Options.gcc_branch_hints:
branch_prediction_macros = \ branch_prediction_macros = \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment