[pypy-commit] pypy default: cleanups

[bdkearns]

Author: Brian Kearns <bdkearns at gmail.com>
Branch: 
Changeset: r70023:c3ed9ebe70f4
Date: 2014-03-17 11:56 -0400
http://bitbucket.org/pypy/pypy/changeset/c3ed9ebe70f4/

Log:	cleanups

diff --git a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
--- a/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
+++ b/rpython/jit/metainterp/optimizeopt/test/test_optimizebasic.py
@@ -1661,7 +1661,7 @@
         self.optimize_loop(ops, ops)
 
     def test_setfield_int_eq_result(self):
-        # test that the setfield_gc does not end up before int_eq 
+        # test that the setfield_gc does not end up before int_eq
         ops = """
         [p1, i1, i2]
         i3 = int_eq(i1, i2)
@@ -5443,6 +5443,7 @@
         jump(i0)
         """
         self.optimize_loop(ops, expected)
-        
+
+
 class TestLLtype(BaseTestOptimizeBasic, LLtypeMixin):
     pass
diff --git a/rpython/jit/metainterp/optimizeopt/util.py b/rpython/jit/metainterp/optimizeopt/util.py
--- a/rpython/jit/metainterp/optimizeopt/util.py
+++ b/rpython/jit/metainterp/optimizeopt/util.py
@@ -1,7 +1,7 @@
 import itertools
 
 import py
-from rpython.rlib.objectmodel import r_dict, compute_identity_hash
+from rpython.rlib.objectmodel import r_dict, compute_identity_hash, specialize
 from rpython.rlib.rarithmetic import intmask
 from rpython.rlib.unroll import unrolling_iterable
 from rpython.jit.metainterp import resoperation
@@ -118,13 +118,10 @@
         res = intmask((1000003 * res) ^ y)
     return res
 
+ at specialize.call_location()
 def args_dict():
     return r_dict(args_eq, args_hash)
 
-def args_dict_box():
-    return r_dict(args_eq, args_hash)
-
-
 # ____________________________________________________________
 
 def equaloplists(oplist1, oplist2, strict_fail_args=True, remap={},
@@ -183,4 +180,3 @@
                         assert False
     assert len(oplist1) == len(oplist2)
     return True
-
diff --git a/rpython/jit/metainterp/optimizeopt/virtualize.py b/rpython/jit/metainterp/optimizeopt/virtualize.py
--- a/rpython/jit/metainterp/optimizeopt/virtualize.py
+++ b/rpython/jit/metainterp/optimizeopt/virtualize.py
@@ -648,7 +648,6 @@
 
     def optimize_SETFIELD_GC(self, op):
         value = self.getvalue(op.getarg(0))
-
         if value.is_virtual():
             fieldvalue = self.getvalue(op.getarg(1))
             value.setfield(op.getdescr(), fieldvalue)
diff --git a/rpython/jit/metainterp/pyjitpl.py b/rpython/jit/metainterp/pyjitpl.py
--- a/rpython/jit/metainterp/pyjitpl.py
+++ b/rpython/jit/metainterp/pyjitpl.py
@@ -11,7 +11,7 @@
     ConstFloat, Box, TargetToken)
 from rpython.jit.metainterp.jitprof import EmptyProfiler
 from rpython.jit.metainterp.logger import Logger
-from rpython.jit.metainterp.optimizeopt.util import args_dict_box
+from rpython.jit.metainterp.optimizeopt.util import args_dict
 from rpython.jit.metainterp.resoperation import rop
 from rpython.rlib import nonconst, rstack
 from rpython.rlib.debug import debug_start, debug_stop, debug_print, make_sure_not_resized
@@ -1656,7 +1656,7 @@
         self.forced_virtualizable = None
         self.partial_trace = None
         self.retracing_from = -1
-        self.call_pure_results = args_dict_box()
+        self.call_pure_results = args_dict()
         self.heapcache = HeapCache()
 
         self.call_ids = []
@@ -1784,16 +1784,14 @@
             moreargs = [box] + extraargs
         else:
             moreargs = list(extraargs)
-        metainterp_sd = self.staticdata
         if opnum == rop.GUARD_NOT_FORCED or opnum == rop.GUARD_NOT_FORCED_2:
-            resumedescr = compile.ResumeGuardForcedDescr(metainterp_sd,
+            resumedescr = compile.ResumeGuardForcedDescr(self.staticdata,
                                                          self.jitdriver_sd)
         elif opnum == rop.GUARD_NOT_INVALIDATED:
             resumedescr = compile.ResumeGuardNotInvalidated()
         else:
             resumedescr = compile.ResumeGuardDescr()
-        guard_op = self.history.record(opnum, moreargs, None,
-                                             descr=resumedescr)
+        guard_op = self.history.record(opnum, moreargs, None, descr=resumedescr)
         self.capture_resumedata(resumedescr, resumepc)
         self.staticdata.profiler.count_ops(opnum, Counters.GUARDS)
         # count