[pypy-svn] pypy jit-short-preamble: dont keep the original snapshot around

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: jit-short-preamble
Changeset: r41162:7b468e722fc1
Date: 2011-01-21 16:16 +0100
http://bitbucket.org/pypy/pypy/changeset/7b468e722fc1/

Log:	dont keep the original snapshot around

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
@@ -166,7 +166,7 @@
             loop.operations = self.optimizer.newoperations
 
             new_snapshot_args = []
-            start_resumedescr = loop.preamble.token.start_resumedescr.clone_if_mutable()
+            start_resumedescr = loop.preamble.start_resumedescr.clone_if_mutable()
             snapshot_args = start_resumedescr.rd_snapshot.prev.boxes 
             for a in snapshot_args:
                 if not isinstance(a, Const):

diff --git a/pypy/jit/metainterp/compile.py b/pypy/jit/metainterp/compile.py
--- a/pypy/jit/metainterp/compile.py
+++ b/pypy/jit/metainterp/compile.py
@@ -102,7 +102,7 @@
     loop.preamble = create_empty_loop(metainterp, 'Preamble ')
     loop.preamble.inputargs = loop.inputargs
     loop.preamble.token = make_loop_token(len(loop.inputargs), jitdriver_sd)
-    loop.preamble.token.start_resumedescr = start_resumedescr
+    loop.preamble.start_resumedescr = start_resumedescr
 
     try:
         old_loop_token = jitdriver_sd.warmstate.optimize_loop(