[pypy-commit] pypy jit-duplicated_short_boxes: kill env vars

[hakanardo]

Author: Hakan Ardo <ha...@debian.org>
Branch: jit-duplicated_short_boxes
Changeset: r46687:2362395bd8b6
Date: 2011-08-21 17:05 +0200
http://bitbucket.org/pypy/pypy/changeset/2362395bd8b6/

Log:    kill env vars

diff --git a/pypy/jit/metainterp/optimizeopt/unroll.py 
b/pypy/jit/metainterp/optimizeopt/unroll.py
--- a/pypy/jit/metainterp/optimizeopt/unroll.py
+++ b/pypy/jit/metainterp/optimizeopt/unroll.py
@@ -143,12 +143,8 @@
                 if const:
                     self.constant_inputargs[box] = const
 
-            if os.getenv('FULLSHORT'):
-                sb = ShortBoxes(self.optimizer,
-                                inputargs + self.constant_inputargs.keys())
-            else:
-                sb = ShortBoxes(self.optimizer,
-                                loop_invariants + 
self.constant_inputargs.keys())
+            sb = ShortBoxes(self.optimizer,
+                            loop_invariants + self.constant_inputargs.keys())
             self.short_boxes = sb
             preamble_optimizer = self.optimizer
             loop.preamble.quasi_immutable_deps = (
diff --git a/pypy/jit/metainterp/optimizeopt/virtualstate.py 
b/pypy/jit/metainterp/optimizeopt/virtualstate.py
--- a/pypy/jit/metainterp/optimizeopt/virtualstate.py
+++ b/pypy/jit/metainterp/optimizeopt/virtualstate.py
@@ -476,8 +476,7 @@
                 self.produce_short_preamble_box(box)
             except BoxNotProducable:
                 pass
-        if not os.getenv('DONT_DUPLICATE'):
-            self.duplicate_short_boxes_if_needed()
+        self.duplicate_short_boxes_if_needed()
 
     def produce_short_preamble_box(self, box):
         if box in self.short_boxes:
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit