[pypy-commit] pypy jitframe-on-heap: fix

fijal noreply at buildbot.pypy.org
Sat Jan 26 00:45:26 CET 2013


Author: Maciej Fijalkowski <fijall at gmail.com>
Branch: jitframe-on-heap
Changeset: r60504:e98c84761a4d
Date: 2013-01-26 01:44 +0200
http://bitbucket.org/pypy/pypy/changeset/e98c84761a4d/

Log:	fix

diff --git a/rpython/jit/backend/x86/assembler.py b/rpython/jit/backend/x86/assembler.py
--- a/rpython/jit/backend/x86/assembler.py
+++ b/rpython/jit/backend/x86/assembler.py
@@ -2021,7 +2021,8 @@
         base_ofs = self.cpu.get_baseofs_of_frame_field()
         self.mov(fail_descr_loc, RawStackLoc(ofs))
         gcmap = self.gcmap_for_finish
-        if op.getarg(0).type == REF:
+        arglist = op.getarglist()
+        if arglist and arglist[0].type == REF:
             self.push_gcmap(self.mc, gcmap, store=True)
         else:
             # note that the 0 here is redundant, but I would rather
diff --git a/rpython/jit/backend/x86/runner.py b/rpython/jit/backend/x86/runner.py
--- a/rpython/jit/backend/x86/runner.py
+++ b/rpython/jit/backend/x86/runner.py
@@ -64,7 +64,6 @@
     def setup_once(self):
         self.profile_agent.startup()
         self.assembler.setup_once()
-        self.gc_set_extra_threshold()
 
     def finish_once(self):
         self.assembler.finish_once()


More information about the pypy-commit mailing list