[pypy-commit] pypy vecopt-merge: some minor reverts from defaults

[plan_rich]

Author: Richard Plangger <planrichi at gmail.com>
Branch: vecopt-merge
Changeset: r79906:bec18388a99b
Date: 2015-09-30 15:42 +0200
http://bitbucket.org/pypy/pypy/changeset/bec18388a99b/

Log:	some minor reverts from defaults

diff --git a/rpython/jit/backend/llsupport/test/test_descr.py b/rpython/jit/backend/llsupport/test/test_descr.py
--- a/rpython/jit/backend/llsupport/test/test_descr.py
+++ b/rpython/jit/backend/llsupport/test/test_descr.py
@@ -144,7 +144,6 @@
     descr4 = get_array_descr(c0, A4)
     descr5 = get_array_descr(c0, A5)
     descr6 = get_array_descr(c0, A6)
-    import pdb; pdb.set_trace()
     assert isinstance(descr1, ArrayDescr)
     assert descr1 == get_array_descr(c0, lltype.GcArray(lltype.Char))
     assert descr1.flag == FLAG_UNSIGNED
diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -575,7 +575,7 @@
         frame_depth = max(self.current_clt.frame_info.jfi_frame_depth,
                           frame_depth_no_fixed_size + JITFRAME_FIXED_SIZE)
         if logger:
-            logger.log_bridge(inputargs, operations, "rewritten",
+            logger.log_bridge(inputargs, operations, "rewritten", faildescr,
                               ops_offset=ops_offset)
         self.fixup_target_tokens(rawstart)
         self.update_frame_depth(frame_depth)
@@ -1020,7 +1020,7 @@
                                                     faildescr, failargs,
                                                     faillocs, frame_depth)
         genop_guard_list[guard_opnum](self, guard_op, guard_token,
-                                         arglocs, resloc)
+                                      arglocs, resloc)
         if not we_are_translated():
             # must be added by the genop_guard_list[]()
             assert guard_token is self.pending_guard_tokens[-1]
diff --git a/rpython/jit/backend/x86/test/test_rx86.py b/rpython/jit/backend/x86/test/test_rx86.py
--- a/rpython/jit/backend/x86/test/test_rx86.py
+++ b/rpython/jit/backend/x86/test/test_rx86.py
@@ -14,9 +14,6 @@
     def getvalue(self):
         return ''.join(self.buffer)
 
-    def clear(self):
-        self.buffer = []
-
     def force_frame_size(self, frame_size):
         pass