Author: Armin Rigo <[email protected]>
Branch: stm-thread-2
Changeset: r59370:a7d331e0315e
Date: 2012-12-08 20:25 +0100
http://bitbucket.org/pypy/pypy/changeset/a7d331e0315e/
Log: Random minor fixes
diff --git a/pypy/rpython/lltypesystem/rffi.py
b/pypy/rpython/lltypesystem/rffi.py
--- a/pypy/rpython/lltypesystem/rffi.py
+++ b/pypy/rpython/lltypesystem/rffi.py
@@ -250,7 +250,7 @@
return cast(lltype.Unsigned, res)
return res
wrapper._annspecialcase_ = 'specialize:ll'
- wrapper._always_inline_ = True
+ wrapper._always_inline_ = 'try'
# for debugging, stick ll func ptr to that
wrapper._ptr = funcptr
wrapper = func_with_new_name(wrapper, name)
@@ -784,7 +784,7 @@
"""
raw_buf = lltype.malloc(TYPEP.TO, count, flavor='raw')
return raw_buf, lltype.nullptr(STRTYPE)
- alloc_buffer._always_inline_ = True # to get rid of the returned tuple
+ alloc_buffer._always_inline_ = 'try' # to get rid of the returned tuple
alloc_buffer._annenforceargs_ = [int]
# (char*, str, int, int) -> None
diff --git a/pypy/rpython/memory/gc/test/test_stmtls.py
b/pypy/rpython/memory/gc/test/test_stmtls.py
--- a/pypy/rpython/memory/gc/test/test_stmtls.py
+++ b/pypy/rpython/memory/gc/test/test_stmtls.py
@@ -77,6 +77,7 @@
HDR = lltype.Struct('header', ('tid', lltype.Signed),
('version', llmemory.Address))
gcheaderbuilder = GCHeaderBuilder(HDR)
+ maximum_extra_threshold = 0
def header(self, addr):
addr -= self.gcheaderbuilder.size_gc_header
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
