[pypy-svn] r75280 - pypy/branch/jit-call-assembler/pypy/jit/metainterp

[arigo at codespeak.net]

Author: arigo
Date: Fri Jun 11 17:10:20 2010
New Revision: 75280

Modified:
   pypy/branch/jit-call-assembler/pypy/jit/metainterp/pyjitpl.py
Log:
This must be done after self.result_type is initialized.


Modified: pypy/branch/jit-call-assembler/pypy/jit/metainterp/pyjitpl.py
==============================================================================
--- pypy/branch/jit-call-assembler/pypy/jit/metainterp/pyjitpl.py	(original)
+++ pypy/branch/jit-call-assembler/pypy/jit/metainterp/pyjitpl.py	Fri Jun 11 17:10:20 2010
@@ -1102,11 +1102,6 @@
         self._addr2name_values = []
 
         self.__dict__.update(compile.make_done_loop_tokens())
-        # store this information for fastpath of call_assembler
-        name = self.result_type
-        tokens = getattr(self, 'loop_tokens_done_with_this_frame_%s' % name)
-        num = self.cpu.get_fail_descr_number(tokens[0].finishdescr)
-        setattr(self.cpu, 'done_with_this_frame_%s_v' % name, num)
 
     def _freeze_(self):
         return True
@@ -1149,6 +1144,12 @@
         RESULT = codewriter.portal_graph.getreturnvar().concretetype
         self.result_type = history.getkind(RESULT)
         #
+        # store this information for fastpath of call_assembler
+        name = self.result_type
+        tokens = getattr(self, 'loop_tokens_done_with_this_frame_%s' % name)
+        num = self.cpu.get_fail_descr_number(tokens[0].finishdescr)
+        setattr(self.cpu, 'done_with_this_frame_%s_v' % name, num)
+        #
         warmrunnerdesc = self.warmrunnerdesc
         if warmrunnerdesc is not None:
             self.num_green_args = warmrunnerdesc.num_green_args