Author: Brian Kearns <[email protected]>
Branch:
Changeset: r69981:eb5cbd7cbd8b
Date: 2014-03-16 13:14 -0700
http://bitbucket.org/pypy/pypy/changeset/eb5cbd7cbd8b/
Log: cleanups
diff --git a/rpython/jit/codewriter/jtransform.py
b/rpython/jit/codewriter/jtransform.py
--- a/rpython/jit/codewriter/jtransform.py
+++ b/rpython/jit/codewriter/jtransform.py
@@ -547,20 +547,18 @@
track_allocation = d.pop('track_allocation', True)
if d:
raise UnsupportedMallocFlags(d)
- TYPE = op.args[0].value
if zero:
name += '_zero'
if add_memory_pressure:
name += '_add_memory_pressure'
if not track_allocation:
name += '_no_track_allocation'
+ TYPE = op.args[0].value
op1 = self.prepare_builtin_call(op, name, args, (TYPE,), TYPE)
- if name == 'raw_malloc_varsize':
- ITEMTYPE = op.args[0].value.OF
- if ITEMTYPE == lltype.Char:
- return self._handle_oopspec_call(op1, args,
-
EffectInfo.OS_RAW_MALLOC_VARSIZE_CHAR,
- EffectInfo.EF_CAN_RAISE)
+ if name == 'raw_malloc_varsize' and TYPE.OF == lltype.Char:
+ return self._handle_oopspec_call(op1, args,
+
EffectInfo.OS_RAW_MALLOC_VARSIZE_CHAR,
+ EffectInfo.EF_CAN_RAISE)
return self.rewrite_op_direct_call(op1)
def rewrite_op_malloc_varsize(self, op):
diff --git a/rpython/jit/metainterp/optimizeopt/test/test_rawbuffer.py
b/rpython/jit/metainterp/optimizeopt/test/test_rawbuffer.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_rawbuffer.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_rawbuffer.py
@@ -17,8 +17,7 @@
( 4, 2, 'descr2', 'two'),
( 8, 4, 'descr3', 'three'),
(12, 2, 'descr4', 'four'),
- ]
- #
+ ]
def test_write_value_update():
buf = RawBuffer(FakeCPU())
@@ -28,7 +27,7 @@
assert buf._get_memory() == [
( 0, 4, 'descr', 'ONE'),
( 4, 2, 'descr', 'two'),
- ]
+ ]
def test_write_value_invalid_length():
buf = RawBuffer(FakeCPU())
@@ -38,7 +37,6 @@
with py.test.raises(InvalidRawWrite):
buf.write_value(0, 4, 'descr2', 'two')
-
def test_write_value_overlapping_next():
buf = RawBuffer(FakeCPU())
buf.write_value(0, 4, 'descr', 'one')
diff --git a/rpython/jit/metainterp/test/test_rawmem.py
b/rpython/jit/metainterp/test/test_rawmem.py
--- a/rpython/jit/metainterp/test/test_rawmem.py
+++ b/rpython/jit/metainterp/test/test_rawmem.py
@@ -1,7 +1,8 @@
from rpython.jit.metainterp.test.support import LLJitMixin
from rpython.rtyper.lltypesystem import lltype, rffi
from rpython.rlib.rawstorage import (alloc_raw_storage, raw_storage_setitem,
- free_raw_storage, raw_storage_getitem)
+ free_raw_storage, raw_storage_getitem)
+
class RawMemTests(object):
def test_cast_void_ptr(self):
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
