[pypy-commit] pypy kill-someobject: remove more dead code about pyobjs

[alex_gaynor]

Author: Alex Gaynor <alex.gaynor at gmail.com>
Branch: kill-someobject
Changeset: r57838:ec21db827d58
Date: 2012-10-07 19:42 +0200
http://bitbucket.org/pypy/pypy/changeset/ec21db827d58/

Log:	remove more dead code about pyobjs

diff --git a/pypy/rpython/memory/gctransform/framework.py b/pypy/rpython/memory/gctransform/framework.py
--- a/pypy/rpython/memory/gctransform/framework.py
+++ b/pypy/rpython/memory/gctransform/framework.py
@@ -5,8 +5,7 @@
 from pypy.rpython.lltypesystem.lloperation import LL_OPERATIONS
 from pypy.rpython.memory import gctypelayout
 from pypy.rpython.memory.gctransform.log import log
-from pypy.rpython.memory.gctransform.support import get_rtti, \
-     ll_call_destructor, type_contains_pyobjs, var_ispyobj
+from pypy.rpython.memory.gctransform.support import get_rtti, ll_call_destructor
 from pypy.rpython.memory.gctransform.transform import GCTransformer
 from pypy.rpython.memory.gctypelayout import ll_weakref_deref, WEAKREF, \
      WEAKREFPTR
@@ -19,6 +18,7 @@
 
 TYPE_ID = llgroup.HALFWORD
 
+
 class CollectAnalyzer(graphanalyze.BoolGraphAnalyzer):
 
     def analyze_direct_call(self, graph, seen=None):
@@ -1184,11 +1184,9 @@
         if self.gcdata.gc.moving_gc and not keep_current_args:
             # moving GCs don't borrow, so the caller does not need to keep
             # the arguments alive
-            livevars = [var for var in hop.livevars_after_op()
-                            if not var_ispyobj(var)]
+            livevars = [var for var in hop.livevars_after_op()]
         else:
             livevars = hop.livevars_after_op() + hop.current_op_keeps_alive()
-            livevars = [var for var in livevars if not var_ispyobj(var)]
         return livevars
 
     def compute_borrowed_vars(self, graph):
@@ -1244,7 +1242,6 @@
         rtti = get_rtti(TYPE)
         destrptr = rtti._obj.destructor_funcptr
         DESTR_ARG = lltype.typeOf(destrptr).TO.ARGS[0]
-        assert not type_contains_pyobjs(TYPE), "not implemented"
         typename = TYPE.__name__
         def ll_finalizer(addr, ignored):
             v = llmemory.cast_adr_to_ptr(addr, DESTR_ARG)
diff --git a/pypy/rpython/memory/test/test_transformed_gc.py b/pypy/rpython/memory/test/test_transformed_gc.py
--- a/pypy/rpython/memory/test/test_transformed_gc.py
+++ b/pypy/rpython/memory/test/test_transformed_gc.py
@@ -1,10 +1,9 @@
 import py
-import sys
 import inspect
+
 from pypy.translator.c import gc
 from pypy.annotation import model as annmodel
-from pypy.annotation import policy as annpolicy
-from pypy.rpython.lltypesystem import lltype, llmemory, llarena, rffi, llgroup
+from pypy.rpython.lltypesystem import lltype, llmemory, rffi, llgroup
 from pypy.rpython.memory.gctransform import framework, shadowstack
 from pypy.rpython.lltypesystem.lloperation import llop, void
 from pypy.rlib.objectmodel import compute_unique_id, we_are_translated
@@ -25,7 +24,7 @@
     t.config.translation.gc = gcname
     t.config.translation.gcremovetypeptr = True
     t.config.set(**extraconfigopts)
-    ann = t.buildannotator(policy=annpolicy.StrictAnnotatorPolicy())
+    ann = t.buildannotator()
     ann.build_types(func, inputtypes)
 
     if specialize: