Author: Armin Rigo <[email protected]>
Branch: gc-del-3
Changeset: r84189:de981b52f14b
Date: 2016-05-04 17:27 +0200
http://bitbucket.org/pypy/pypy/changeset/de981b52f14b/
Log: Reduce the diff
diff --git a/rpython/memory/gc/base.py b/rpython/memory/gc/base.py
--- a/rpython/memory/gc/base.py
+++ b/rpython/memory/gc/base.py
@@ -1,7 +1,6 @@
from rpython.rtyper.lltypesystem import lltype, llmemory, llarena, rffi
from rpython.rtyper.lltypesystem.lloperation import llop
from rpython.rlib.debug import ll_assert
-from rpython.rlib.objectmodel import we_are_translated
from rpython.memory.gcheader import GCHeaderBuilder
from rpython.memory.support import DEFAULT_CHUNK_SIZE
from rpython.memory.support import get_address_stack, get_address_deque
diff --git a/rpython/memory/gctypelayout.py b/rpython/memory/gctypelayout.py
--- a/rpython/memory/gctypelayout.py
+++ b/rpython/memory/gctypelayout.py
@@ -392,7 +392,7 @@
def make_destructor_funcptr_for_type(self, TYPE):
# must be overridden for proper destructor support
- return None
+ return None, False
def make_custom_trace_funcptr_for_type(self, TYPE):
# must be overridden for proper custom tracer support
diff --git a/rpython/memory/gcwrapper.py b/rpython/memory/gcwrapper.py
--- a/rpython/memory/gcwrapper.py
+++ b/rpython/memory/gcwrapper.py
@@ -4,7 +4,6 @@
from rpython.rtyper.annlowlevel import llhelper, cast_nongc_instance_to_adr
from rpython.memory import gctypelayout
from rpython.flowspace.model import Constant
-from rpython.rlib import rgc
class GCManagedHeap(object):
diff --git a/rpython/memory/test/test_transformed_gc.py
b/rpython/memory/test/test_transformed_gc.py
--- a/rpython/memory/test/test_transformed_gc.py
+++ b/rpython/memory/test/test_transformed_gc.py
@@ -50,8 +50,6 @@
taggedpointers = False
def setup_class(cls):
- if cls is not TestIncrementalMiniMarkGC:
- py.test.skip("FOO")
cls.marker = lltype.malloc(rffi.CArray(lltype.Signed), 1,
flavor='raw', zero=True)
funcs0 = []
@@ -876,7 +874,7 @@
op.args = [Constant(type_id, llgroup.HALFWORD),
Constant(llmemory.sizeof(P), lltype.Signed),
Constant(False, lltype.Bool), # has_finalizer
- Constant(False, lltype.Bool), #
has_finalizer_light
+ Constant(False, lltype.Bool), #
is_finalizer_light
Constant(False, lltype.Bool)] # contains_weakptr
break
else:
@@ -913,7 +911,7 @@
op.args = [Constant(type_id, llgroup.HALFWORD),
Constant(llmemory.sizeof(P), lltype.Signed),
Constant(False, lltype.Bool), # has_finalizer
- Constant(False, lltype.Bool), #
has_finalizer_light
+ Constant(False, lltype.Bool), #
is_finalizer_light
Constant(False, lltype.Bool)] # contains_weakptr
break
else:
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
