Commit 5c5f0717 authored by Stefan Behnel's avatar Stefan Behnel

rolled back accidentally committed files

parent 411a6354
......@@ -29,7 +29,7 @@ builtin_function_table = [
#('id', "", "", ""),
#('input', "", "", ""),
('intern', "s", "O", "__Pyx_InternFromString"),
#('isinstance', "OO", "b", "PyObject_IsInstance"), # optimised later on
('isinstance', "OO", "b", "PyObject_IsInstance"),
('issubclass', "OO", "b", "PyObject_IsSubclass"),
('iter', "O", "O", "PyObject_GetIter"),
('len', "O", "Z", "PyObject_Length"),
......
......@@ -712,41 +712,6 @@ class OptimizeBuiltinCalls(Visitor.VisitorTransform):
"expected 2 or 3, found %d" % len(args))
return node
PyObject_TypeCheck_func_type = PyrexTypes.CFuncType(
PyrexTypes.c_bint_type, [
PyrexTypes.CFuncTypeArg("obj", PyrexTypes.py_object_type, None),
PyrexTypes.CFuncTypeArg("type", PyrexTypes.c_py_type_object_ptr_type, None),
])
PyObject_IsInstance_func_type = PyrexTypes.CFuncType(
PyrexTypes.c_bint_type, [
PyrexTypes.CFuncTypeArg("obj", PyrexTypes.py_object_type, None),
PyrexTypes.CFuncTypeArg("type", PyrexTypes.py_object_type, None),
])
def _handle_simple_function_isinstance(self, node, pos_args):
"""Replace generic calls to isinstance(x, type) by a more
efficient type check.
"""
args = pos_args.args
if len(args) != 2:
error(node.pos, "isinstance(x, type) called with wrong number of args, found %d" %
len(args))
return node
type_arg = args[1]
if type_arg.type is Builtin.type_type:
function_name = "PyObject_TypeCheck"
function_type = self.PyObject_TypeCheck_func_type
args[1] = ExprNodes.CastNode(type_arg, PyrexTypes.c_py_type_object_ptr_type)
else:
function_name = "PyObject_IsInstance"
function_type = self.PyObject_IsInstance_func_type
return ExprNodes.PythonCapiCallNode(
node.pos, function_name, function_type,
args = args, is_temp = node.is_temp)
Pyx_Type_func_type = PyrexTypes.CFuncType(
Builtin.type_type, [
PyrexTypes.CFuncTypeArg("object", PyrexTypes.py_object_type, None)
......@@ -1094,7 +1059,7 @@ class FinalOptimizePhase(Visitor.CythonTransform):
The optimizations currently implemented in this class are:
- Eliminate None assignment and refcounting for first assignment.
- Eliminate dead coercion nodes.
- isinstance -> typecheck for cdef types
"""
def visit_SingleAssignmentNode(self, node):
"""Avoid redundant initialisation of local variables before their
......@@ -1110,23 +1075,18 @@ class FinalOptimizePhase(Visitor.CythonTransform):
lhs.entry.init = 0
return node
def visit_NoneCheckNode(self, node):
"""Remove NoneCheckNode nodes wrapping nodes that cannot
possibly be None.
FIXME: the list below might be better maintained as a node
class attribute...
def visit_SimpleCallNode(self, node):
"""Replace generic calls to isinstance(x, type) by a more efficient
type check.
"""
target = node.arg
if isinstance(target, ExprNodes.NoneNode):
return node
if not target.type.is_pyobject:
return target
if isinstance(target, (ExprNodes.ConstNode,
ExprNodes.NumBinopNode)):
return target
if isinstance(target, (ExprNodes.SequenceNode,
ExprNodes.ComprehensionNode,
ExprNodes.SetNode, ExprNodes.DictNode)):
return target
self.visitchildren(node)
if node.function.type.is_cfunction and isinstance(node.function, ExprNodes.NameNode):
if node.function.name == 'isinstance':
type_arg = node.args[1]
if type_arg.type.is_builtin_type and type_arg.type.name == 'type':
from CythonScope import utility_scope
node.function.entry = utility_scope.lookup('PyObject_TypeCheck')
node.function.type = node.function.entry.type
PyTypeObjectPtr = PyrexTypes.CPtrType(utility_scope.lookup('PyTypeObject').type)
node.args[1] = ExprNodes.CastNode(node.args[1], PyTypeObjectPtr)
return node
......@@ -1691,9 +1691,6 @@ c_anon_enum_type = CAnonEnumType(-1, 1)
c_py_buffer_type = CStructOrUnionType("Py_buffer", "struct", None, 1, "Py_buffer")
c_py_buffer_ptr_type = CPtrType(c_py_buffer_type)
c_py_type_object_type = CStructOrUnionType("PyTypeObject", "struct", None, 1, "PyTypeObject")
c_py_type_object_ptr_type = CPtrType(c_py_type_object_type)
error_type = ErrorType()
unspecified_type = UnspecifiedType()
......
......@@ -8,7 +8,6 @@ unsignedbehaviour_T184
funcexc_iter_T228
bad_c_struct_T252
missing_baseclass_in_predecl_T262
compile_time_unraisable_T370
# Not yet enabled
profile_test
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