Author: Alex Gaynor <[email protected]>
Branch: kill-someobject
Changeset: r57839:f3367162aaed
Date: 2012-10-07 19:45 +0200
http://bitbucket.org/pypy/pypy/changeset/f3367162aaed/
Log: Remove naming that no longer makes sense.
diff --git a/pypy/rpython/memory/gctransform/boehm.py
b/pypy/rpython/memory/gctransform/boehm.py
--- a/pypy/rpython/memory/gctransform/boehm.py
+++ b/pypy/rpython/memory/gctransform/boehm.py
@@ -57,12 +57,6 @@
self.mixlevelannotator.finish() # for now
self.mixlevelannotator.backend_optimize()
- def push_alive_nopyobj(self, var, llops):
- pass
-
- def pop_alive_nopyobj(self, var, llops):
- pass
-
def gct_fv_gc_malloc(self, hop, flags, TYPE, c_size):
# XXX same behavior for zero=True: in theory that's wrong
if TYPE._is_atomic():
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
@@ -1174,12 +1174,6 @@
def var_needs_set_transform(self, var):
return var_needsgc(var)
- def push_alive_nopyobj(self, var, llops):
- pass
-
- def pop_alive_nopyobj(self, var, llops):
- pass
-
def get_livevars_for_roots(self, hop, keep_current_args=False):
if self.gcdata.gc.moving_gc and not keep_current_args:
# moving GCs don't borrow, so the caller does not need to keep
diff --git a/pypy/rpython/memory/gctransform/refcounting.py
b/pypy/rpython/memory/gctransform/refcounting.py
--- a/pypy/rpython/memory/gctransform/refcounting.py
+++ b/pypy/rpython/memory/gctransform/refcounting.py
@@ -142,11 +142,11 @@
def var_needs_set_transform(self, var):
return var_needsgc(var)
- def push_alive_nopyobj(self, var, llops):
+ def push_alive(self, var, llops):
v_adr = gen_cast(llops, llmemory.Address, var)
llops.genop("direct_call", [self.increfptr, v_adr])
- def pop_alive_nopyobj(self, var, llops):
+ def pop_alive(self, var, llops):
PTRTYPE = var.concretetype
v_adr = gen_cast(llops, llmemory.Address, var)
diff --git a/pypy/rpython/memory/gctransform/test/test_transform.py
b/pypy/rpython/memory/gctransform/test/test_transform.py
--- a/pypy/rpython/memory/gctransform/test/test_transform.py
+++ b/pypy/rpython/memory/gctransform/test/test_transform.py
@@ -5,11 +5,9 @@
from pypy.translator.translator import TranslationContext, graphof
from pypy.translator.exceptiontransform import ExceptionTransformer
from pypy.rpython.lltypesystem import lltype
-from pypy.objspace.flow.model import Variable
-from pypy.annotation import model as annmodel
-from pypy.rpython.extregistry import ExtRegistryEntry
from pypy import conftest
+
class LLInterpedTranformerTests:
def llinterpreter_for_transformed_graph(self, f, args_s):
@@ -93,12 +91,13 @@
res = llinterp.eval_graph(graph, [False])
assert res == f(False)
+
class _TestGCTransformer(BaseGCTransformer):
- def push_alive_nopyobj(self, var, llops):
+ def push_alive(self, var, llops):
llops.genop("gc_push_alive", [var])
- def pop_alive_nopyobj(self, var, llops):
+ def pop_alive(self, var, llops):
llops.genop("gc_pop_alive", [var])
diff --git a/pypy/rpython/memory/gctransform/transform.py
b/pypy/rpython/memory/gctransform/transform.py
--- a/pypy/rpython/memory/gctransform/transform.py
+++ b/pypy/rpython/memory/gctransform/transform.py
@@ -312,15 +312,9 @@
self.pop_alive(v_old, hop.llops)
def push_alive(self, var, llops):
- self.push_alive_nopyobj(var, llops)
+ pass
def pop_alive(self, var, llops):
- self.pop_alive_nopyobj(var, llops)
-
- def push_alive_nopyobj(self, var, llops):
- pass
-
- def pop_alive_nopyobj(self, var, llops):
pass
def var_needs_set_transform(self, var):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
