[pypy-svn] r22195 - in pypy/dist/pypy/jit: . test

[arigo at codespeak.net]

Author: arigo
Date: Sun Jan 15 13:24:23 2006
New Revision: 22195

Modified:
   pypy/dist/pypy/jit/llabstractinterp.py
   pypy/dist/pypy/jit/llcontainer.py
   pypy/dist/pypy/jit/test/test_jit_tl.py
Log:
Synchronized small fixes with Samuele's, some of which accidentally checked in
twice in two different ways -- I got out of sync during codespeak downtime.


Modified: pypy/dist/pypy/jit/llabstractinterp.py
==============================================================================
--- pypy/dist/pypy/jit/llabstractinterp.py	(original)
+++ pypy/dist/pypy/jit/llabstractinterp.py	Sun Jan 15 13:24:23 2006
@@ -154,8 +154,6 @@
 # hint-driven policy
 best_policy = Policy(inlining=True, const_propagate=True, concrete_args=False,
                      oopspec=True)
-best_policy_oopspec = Policy(inlining=True, const_propagate=True, concrete_args=False,
-                             oopspec=True)
 
 
 class LLAbstractInterp(object):

Modified: pypy/dist/pypy/jit/llcontainer.py
==============================================================================
--- pypy/dist/pypy/jit/llcontainer.py	(original)
+++ pypy/dist/pypy/jit/llcontainer.py	Sun Jan 15 13:24:23 2006
@@ -52,7 +52,7 @@
     def build_runtime_container(self, builder):
         v_result = newvar(lltype.Ptr(self.T))
         if self.a_parent is not None:
-            v_parent = self.a_parent.content.build_runtime_container(builder)
+            v_parent = self.a_parent.forcevarorconst(builder)
             op = SpaceOperation('getsubstruct', [v_parent,
                                                  const(self.parentindex,
                                                        lltype.Void)],

Modified: pypy/dist/pypy/jit/test/test_jit_tl.py
==============================================================================
--- pypy/dist/pypy/jit/test/test_jit_tl.py	(original)
+++ pypy/dist/pypy/jit/test/test_jit_tl.py	Sun Jan 15 13:24:23 2006
@@ -3,7 +3,7 @@
 import py
 from pypy.translator.translator import TranslationContext
 from pypy.jit import tl
-from pypy.jit.llabstractinterp import LLAbstractInterp, best_policy_oopspec
+from pypy.jit.llabstractinterp import LLAbstractInterp
 from pypy.rpython.rstr import string_repr
 from pypy.rpython.llinterp import LLInterpreter
 #from pypy.translator.backendopt import inline
@@ -22,7 +22,7 @@
     
 
 def jit_tl(code):
-    interp = LLAbstractInterp(policy=best_policy_oopspec)
+    interp = LLAbstractInterp()
     hints = {0: string_repr.convert_const(code),
              1: 0}
     graph2 = interp.eval(graph1, hints)