[pypy-commit] pypy jit-targets: translation fixes

[arigo]

Author: Armin Rigo <arigo at tunes.org>
Branch: jit-targets
Changeset: r49764:77f8a107311c
Date: 2011-11-24 22:52 +0100
http://bitbucket.org/pypy/pypy/changeset/77f8a107311c/

Log:	translation fixes

diff --git a/pypy/jit/backend/llsupport/regalloc.py b/pypy/jit/backend/llsupport/regalloc.py
--- a/pypy/jit/backend/llsupport/regalloc.py
+++ b/pypy/jit/backend/llsupport/regalloc.py
@@ -38,7 +38,10 @@
         return newloc
 
     def forget_frame_allocation(self, box):
-        self.frame_bindings.pop(box, None)
+        try:
+            del self.frame_bindings[box]
+        except KeyError:
+            pass
 
     def reserve_location_in_frame(self, size):
         frame_depth = self.frame_depth
diff --git a/pypy/jit/metainterp/history.py b/pypy/jit/metainterp/history.py
--- a/pypy/jit/metainterp/history.py
+++ b/pypy/jit/metainterp/history.py
@@ -979,8 +979,8 @@
         self.loops = []
         self.locations = []
         self.aborted_keys = []
-        self.invalidated_token_numbers = set()
-        self.jitcell_token_wrefs = set()
+        self.invalidated_token_numbers = set()    # <- not RPython
+        self.jitcell_token_wrefs = []
 
     def clear(self):
         del self.loops[:]
@@ -992,7 +992,7 @@
         self.aborted_count = 0
 
     def add_jitcell_token(self, token):
-        self.jitcell_token_wrefs.add(weakref.ref(token))
+        self.jitcell_token_wrefs.append(weakref.ref(token))
         
     def set_history(self, history):
         self.operations = history.operations