Author: Armin Rigo <[email protected]>
Branch: continulet-jit-3
Changeset: r58734:3c39ceadba97
Date: 2012-11-05 09:15 +0100
http://bitbucket.org/pypy/pypy/changeset/3c39ceadba97/
Log: Fixes
diff --git a/pypy/jit/metainterp/logger.py b/pypy/jit/metainterp/logger.py
--- a/pypy/jit/metainterp/logger.py
+++ b/pypy/jit/metainterp/logger.py
@@ -127,7 +127,7 @@
res = self.repr_of_arg(op.result) + " = "
else:
res = ""
- is_guard = op.is_guard()
+ is_guard = op.is_guard() or op.getopnum() == rop.FINISH
if op.getdescr() is not None:
descr = op.getdescr()
if is_guard and self.guard_number:
diff --git a/pypy/jit/metainterp/test/test_logger.py
b/pypy/jit/metainterp/test/test_logger.py
--- a/pypy/jit/metainterp/test/test_logger.py
+++ b/pypy/jit/metainterp/test/test_logger.py
@@ -100,7 +100,7 @@
[i0]
i1 = int_add(i0, 1)
guard_true(i0) [i0, i1]
- finish(i1)
+ finish(i1) []
'''
self.reparse(inp)
@@ -109,7 +109,7 @@
[i0]
i1 = int_add(i0, 1)
guard_true(i0) [i0, None, i1]
- finish(i1)
+ finish(i1) []
'''
self.reparse(inp)
diff --git a/pypy/jit/tool/oparser.py b/pypy/jit/tool/oparser.py
--- a/pypy/jit/tool/oparser.py
+++ b/pypy/jit/tool/oparser.py
@@ -230,7 +230,7 @@
i = line.find('[', endnum) + 1
j = line.find(']', i)
if (i <= 0 or j <= 0) and not self.nonstrict:
- raise ParseError("missing fail_args for guard operation")
+ raise ParseError("missing fail_args for %r" % line)
fail_args = []
if i < j:
for arg in line[i:j].split(','):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
