[pypy-commit] pypy stmgc-c7: Small fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: stmgc-c7
Changeset: r74599:9ddb804903be
Date: 2014-11-19 12:19 +0100
http://bitbucket.org/pypy/pypy/changeset/9ddb804903be/

Log:	Small fixes

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
@@ -97,7 +97,7 @@
             return res
 
         from rpython.translator.c.genc import CStandaloneBuilder
-        from rpython.annotation.listdef import s_list_of_strings
+        from rpython.annotator.listdef import s_list_of_strings
 
         s_args = s_list_of_strings
         t = rtype(entrypoint, [s_args], gcname=cls.gcname,
diff --git a/rpython/rtyper/lltypesystem/rffi.py b/rpython/rtyper/lltypesystem/rffi.py
--- a/rpython/rtyper/lltypesystem/rffi.py
+++ b/rpython/rtyper/lltypesystem/rffi.py
@@ -836,7 +836,6 @@
         # following code is executed if:
         # - rgc.can_move(data) and rgc.pin(data) both returned true
         # - rgc.can_move(data) returned false
-        assert not rgc.stm_is_enabled()
         data_start = cast_ptr_to_adr(lldata) + \
             offsetof(STRTYPE, 'chars') + itemoffsetof(STRTYPE.chars, 0)
 
diff --git a/rpython/translator/stm/inevitable.py b/rpython/translator/stm/inevitable.py
--- a/rpython/translator/stm/inevitable.py
+++ b/rpython/translator/stm/inevitable.py
@@ -17,6 +17,7 @@
     'jit_record_known_class',
     'gc_identityhash', 'gc_id', 'gc_can_move', 'gc__collect',
     'gc_adr_of_root_stack_top', 'gc_add_memory_pressure',
+    'gc_pin', 'gc_unpin', 'gc__is_pinned',
     'weakref_create', 'weakref_deref',
     'jit_assembler_call', 'gc_writebarrier',
     'shrink_array',