[pypy-commit] pypy resume-refactor: (fijal, antocuni) kill the failargs support from logger

[fijal]

Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: resume-refactor
Changeset: r66410:07794a0a5cb2
Date: 2013-08-28 17:23 +0100
http://bitbucket.org/pypy/pypy/changeset/07794a0a5cb2/

Log:	(fijal, antocuni) kill the failargs support from logger

diff --git a/rpython/jit/metainterp/logger.py b/rpython/jit/metainterp/logger.py
--- a/rpython/jit/metainterp/logger.py
+++ b/rpython/jit/metainterp/logger.py
@@ -147,12 +147,7 @@
                 args += ', descr=' + r
             else:
                 args = "descr=" + r
-        if is_guard and op.getfailargs() is not None:
-            fail_args = ' [' + ", ".join([self.repr_of_arg(arg)
-                                          for arg in op.getfailargs()]) + ']'
-        else:
-            fail_args = ''
-        return s_offset + res + op.getopname() + '(' + args + ')' + fail_args
+        return s_offset + res + op.getopname() + '(' + args + ')'
 
     def _log_inputarg_setup_ops(self, op):
         target_token = op.getdescr()
diff --git a/rpython/jit/metainterp/test/test_logger.py b/rpython/jit/metainterp/test/test_logger.py
--- a/rpython/jit/metainterp/test/test_logger.py
+++ b/rpython/jit/metainterp/test/test_logger.py
@@ -100,7 +100,7 @@
         inp = '''
         [i0]
         i1 = int_add(i0, 1)
-        guard_true(i0) [i0, i1]
+        guard_true(i0)
         finish(i1)
         '''
         self.reparse(inp)
@@ -108,7 +108,7 @@
     def test_guard_not_invalidated(self):
         inp = '''
         []
-        guard_not_invalidated(descr=descr) []
+        guard_not_invalidated(descr=descr)
         finish(descr=finaldescr)
         '''
         loop = pure_parse(inp, namespace={'descr': Descr(),
@@ -117,15 +117,6 @@
         output = logger.log_loop(loop, {'descr': Descr()})
         assert 'guard_not_invalidated(descr=' in output
 
-    def test_guard_w_hole(self):
-        inp = '''
-        [i0]
-        i1 = int_add(i0, 1)
-        guard_true(i0) [i0, None, i1]
-        finish(i1)
-        '''
-        self.reparse(inp)
-
     def test_debug_merge_point(self):
         inp = '''
         []
@@ -161,12 +152,12 @@
         namespace = {'fdescr': BasicFailDescr()}
         inp = '''
         [i0]
-        guard_true(i0, descr=fdescr) [i0]
+        guard_true(i0, descr=fdescr)
         '''
         loop = pure_parse(inp, namespace=namespace)
         logger = Logger(self.make_metainterp_sd(), guard_number=True)
         output = logger.log_loop(loop)
-        assert re.match("guard_true\(i0, descr=<Guard0x[\da-f]+>\) \[i0\]", output.splitlines()[-1])
+        assert re.match("guard_true\(i0, descr=<Guard0x[\da-f]+>\)", output.splitlines()[-1])
         pure_parse(output)
 
         logger = Logger(self.make_metainterp_sd(), guard_number=False)